36 files changed, 61589 insertions, 54566 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7c6a95f7f..bf523c6e3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,14 +2,14 @@
 # Please keep this file sorted alphabetically.
 
 data/empathy.desktop.in.in
-data/org.gnome.Empathy.gschema.xml.in
 data/empathy-accounts.desktop.in.in
+data/org.gnome.Empathy.gschema.xml.in
 
 libempathy/empathy-ft-handler.c
 libempathy/empathy-message.c
-libempathy/empathy-tp-contact-list.c
 libempathy/empathy-utils.c
 libempathy/empathy-time.c
+libempathy/empathy-keyring.c
 
 libempathy-gtk/empathy-account-chooser.c
 libempathy-gtk/empathy-account-widget.c
@@ -43,14 +43,12 @@ libempathy-gtk/empathy-groups-widget.c
 libempathy-gtk/empathy-individual-dialogs.c
 libempathy-gtk/empathy-individual-edit-dialog.c
 libempathy-gtk/empathy-individual-information-dialog.c
-libempathy-gtk/empathy-individual-linker.c
 libempathy-gtk/empathy-individual-menu.c
 libempathy-gtk/empathy-individual-view.c
 libempathy-gtk/empathy-individual-widget.c
 [type: gettext/glade]libempathy-gtk/empathy-individual-widget.ui
 libempathy-gtk/empathy-irc-network-chooser-dialog.c
 libempathy-gtk/empathy-irc-network-dialog.c
-libempathy-gtk/empathy-linking-dialog.c
 libempathy-gtk/empathy-log-window.c
 [type: gettext/glade]libempathy-gtk/empathy-log-window.ui
 libempathy-gtk/empathy-new-message-dialog.c
@@ -77,11 +75,9 @@ nautilus-sendto-plugin/empathy-nautilus-sendto.c
 
 src/empathy.c
 src/empathy-about-dialog.c
-src/empathy-account-assistant.c
 src/empathy-accounts-dialog.c
 [type: gettext/glade]src/empathy-accounts-dialog.ui
 src/empathy-auth-client.c
-src/empathy-auto-salut-account-helper.c
 src/empathy-av.c
 src/empathy-streamed-media-window.c
 [type: gettext/glade]src/empathy-call-window.ui
@@ -121,3 +117,4 @@ src/empathy-call-window.c
 src/empathy-call.c
 libempathy-gtk/empathy-search-bar.c
 libempathy-gtk/empathy-new-account-dialog.c
+libempathy-gtk/empathy-local-xmpp-assistant-widget.c
diff --git a/po/ar.po b/po/ar.po
index 4bd821e13..853524f84 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,411 +6,458 @@
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Abou Manal <aboumanal@gmail.com>, 2008.
 # Djihed Afifi<djihed@gmail.com, 2008.
-# Anas Afif Emad <anas.e87@gmail.com, 2008.
+# Anas Afif Emad <anas.e87@gmail.com, 2008, 2012.
 # Khaled Hosny <khaledhosny@eglug.org>, 2006, 2009, 2010, 2011.
+# Abderrahim Kitouni <a.kitouni@gmail.com>, 2012.
+# Ibrahim Saed <ibraheem5000@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip.HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-19 02:56+0200\n"
-"PO-Revision-Date: 2011-03-19 02:56+0300\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\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-01 09:19+0000\n"
+"PO-Revision-Date: 2012-02-25 09:44+0200\n"
+"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"
+"Language-Team: Arabeyes\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "دردش عبر جوجل توك و فيسبوك و MSN وغيرها من خدمات الدردشة"
+msgid "Empathy"
+msgstr "إمبَثي"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy"
-msgstr "إمبثي"
+msgid "IM Client"
+msgstr "عميل محادثة فورية"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "المرسال إمبثي"
+msgstr "مرسال الإنترنت إمبَثي"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "مرسال محادثة فورية"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "دردش عبر جوجل توك وفيسبوك وMSN وغيرها من خدمات الدردشة"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "حسابات التراسل"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "أدر حسابات التراسل والصوت عبر الشبكة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "افتح نافذة واحدة لكل محادثة."
+msgid "Connection managers should be used"
+msgstr "يجب استعمال مدراء الاتصال"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"المِحرف الذي يجب إضافته بعد الأسماء عند استعمال (Tab) لتكملة الأسماء في "
-"المحادثات الجماعية."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "فيما إذا يستخدم مدراء الشبكة لقطع الاتصال أو استرجاعه."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "سمة نافذة المحادثة"
+msgid "Empathy should auto-connect on startup"
+msgstr "الاتصال الآلي عند بدء البرنامج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "قائمة لغات التدقيق الإملائي (افصل بفاصلة، مثال: en, fr, nl)"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "فيما إذا كان على إمبثي الولوج آليا إلى حساباتك عند بدء التشغيل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Compact contact list"
-msgstr "لائحة مختصرة للمتراسلين"
+msgid "Empathy should auto-away when idle"
+msgstr "على إمبثي تغيير الحالة إلى بعيد تلقائيًا عند الخمول"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Connection managers should be used"
-msgstr "يجب استعمال مدراء الشبكة"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "فيما إذا كان على إمبثي الانتقال إلى حالة بعيد تلقائيا عند السكون."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Contact list sort criterion"
-msgstr "معيار ترتيب لائحة المتراسلين"
+msgid "Empathy default download folder"
+msgstr "مجلد التنزيل الافتراضي لإمبثي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Default directory to select an avatar image from"
-msgstr "المجلد المبدئي لاختيار الصورة الشخصية"
+msgid "The default folder to save file transfers in."
+msgstr "المجلد المبدئي لحفظ الملفات المنقولة فيه."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Disable popup notifications when away"
-msgstr "عطل التنبيهات المنبثقة عندما أكون بعيدا"
+msgid "Show offline contacts"
+msgstr "أظهر المتراسلين غير المتَّصلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable sounds when away"
-msgstr "عطل الأصوات عندما أكون بعيدا"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "عرض المرسلين غير المتصلين في لائحة المتراسلين."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Display incoming events in the status area"
-msgstr "اعرض الأحداث القادمة في منطقة الحالة"
+msgid "Show avatars"
+msgstr "أعرض الصور الشخصية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"اعرض الأحداث القادمة في منطقة الحالة. إذا لم يكن صحيحا فستعرض مباشرة على "
-"المستخدم."
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "إظهار صور شخصية للمتراسلين في لائحة المتراسلين ونوافذ المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Empathy can publish the user's location"
-msgstr "يستطيع إمبثي نشر مكان المستخدم"
+msgid "Show protocols"
+msgstr "أظهر البروتوكولات"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Empathy can use the GPS to guess the location"
-msgstr "يستطيع إمبثي استخدام GPS لتخمين مكان المستخدم"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ما إذا ستُعرض بروتوكولات المتراسلين في القائمة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "يستطيع إمبثي استخدام شبكة الهاتف المحمول لتخمين مكان المستخدم"
+msgid "Show Balance in contact list"
+msgstr "أظهر الرصيد في قائمة المتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Empathy can use the network to guess the location"
-msgstr "يستطيع إمبثي استخدام الشبكة لتخمين مكان المستخدم"
+msgid "Whether to show account balances in the contact list."
+msgstr "لعرض رصيد الحساب في قائمة المتراسلين."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy default download folder"
-msgstr "مجلد التنزيل المبدئي لإمبثي"
+msgid "Compact contact list"
+msgstr "لائحة مصغرة للمتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has migrated butterfly logs"
-msgstr "رحّل إمبثي سجلات butterfly"
+msgid "Whether to show the contact list in compact mode."
+msgstr "عرض قائمة المتراسلين في شكلها المختصر."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy should auto-away when idle"
-msgstr "على إمبثى تغيير الحالة إلى بعيد تلقائيا عند الخمول"
+msgid "Hide main window"
+msgstr "أخفِ النافذة الرئيسية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-connect on startup"
-msgstr "الاتصال الآلي عند بدء البرنامج"
+msgid "Hide the main window."
+msgstr "أخفِ النافذة الرئيسية."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should reduce the location's accuracy"
-msgstr "على إمبثي تقليل دقة تحديد المكان"
+msgid "Default directory to select an avatar image from"
+msgstr "المجلد المبدئي لاختيار الصورة الشخصية"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "استخدام الصور الشخصيّة للمتراسل كأيقونة لنافذة المحادثة"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "آخر مجلد اختِيرت منه الصورة الشخصية."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Enable WebKit Developer Tools"
-msgstr "فعّل أدوات وب‌كِت للمطورين"
+msgid "Open new chats in separate windows"
+msgstr "افتح المحادثات الجديدة في نوافذ منفصلة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable popup notifications for new messages"
-msgstr "فعّل التنبيهات المنبثقة للرسائل الجديدة"
+msgid "Always open a separate chat window for new chats."
+msgstr "افتح نافذة منفصلة دائمًا للمحادثات الجديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable spell checker"
-msgstr "فعّل التدقيق الإملائي"
+msgid "Display incoming events in the status area"
+msgstr "اعرض الأحداث الواردة في منطقة الحالة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Hide main window"
-msgstr "أخفِ النافذة الرئيسية"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"اعرض الأحداث الواردة في منطقة الحالة. إذا لم يكن صحيحا فستعرض مباشرة على "
+"المستخدم."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Hide the main window."
-msgstr "أخفِ النافذة الرئيسية"
+msgid "The position for the chat window side pane"
+msgstr "موضع اللوحة الجانبية في نافذة الدردشة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Nick completed character"
-msgstr "مِحرف الكنية التام"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "الموضع المحفوظ (بالبكسل) للّوحة الجانبية في نافذة الدردشة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Open new chats in separate windows"
-msgstr "افتح المحادثات الجديدة في نوافذ متفرقة"
+msgid "Show contact groups"
+msgstr "أظهر مجموعات المتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Path of the Adium theme to use"
-msgstr "مسار سمة Adium لتستخدم"
+msgid "Whether to show groups in the contact list."
+msgstr "إذا كنت ترغب في إظهار المجموعات في قائمة المتراسلين."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "مسار سمة Adium التي ستستخدم إذا كانت سمة الدردشة المستخدمة Adium."
+msgid "Contact list sort criterion"
+msgstr "معيار ترتيب لائحة المتراسلين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Play a sound for incoming messages"
-msgstr "شغل صوت عند وصول الرسائل"
+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 ""
+"المعيار المطلوب استخدامه لترتيب قائمة المتراسلين. الأصل هو الترتيب حسب حالة "
+"المتراسل باستخدام القيمة \"الحالة\". لترتيب المتراسلين حسب الاسم استخدم "
+"القيمة \"الاسم\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Play a sound for new conversations"
-msgstr "شغل صوت للمحادثات الجديدة"
+msgid "Use notification sounds"
+msgstr "استخدم أصوات التبليغ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for outgoing messages"
-msgstr "شغل صوت عند إرسال الرسائل"
+msgid "Whether to play a sound to notify of events."
+msgstr "ما إذا سيشغل صوت للتنبيه عن الأحداث."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Play a sound when a contact logs in"
-msgstr "_شغل صوت عندما يسجل الدخول أحد جهات الإتصال"
+msgid "Disable sounds when away"
+msgstr "عطل الأصوات عندما أكون بعيدًا"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Play a sound when a contact logs out"
-msgstr "شغل صوت عندما يقوم أحد المتراسلين بالخروج"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ما إذا سيشغل صوت عندما أكون بعيدا أو مشغولا."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when we log in"
-msgstr "شغل صوت عندما ألج"
+msgid "Play a sound for incoming messages"
+msgstr "شغل صوت عند وصول الرسائل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log out"
-msgstr "شغل صوت عندما أخرج"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ما إذا سيشغل صوت عند وصول الرسائل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
+msgid "Play a sound for outgoing messages"
+msgstr "شغل صوت عند إرسال الرسائل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications when a contact logs in"
-msgstr "أظهر تنبيهات منبثقة عند ولوج المتراسل"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ما إذا سيشغل صوت عند إرسال الرسائل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs out"
-msgstr "أظهر تنبيهات منبثقة عند خروج المتراسل"
+msgid "Play a sound for new conversations"
+msgstr "شغل صوت للمحادثات الجديدة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Show avatars"
-msgstr "أعرض الصور الشخصية"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "ما إذا سيشغل صوت للمحادثات الجديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show contact list in rooms"
-msgstr "أظهر قائمة المتراسلين في الغرف"
+msgid "Play a sound when a contact logs in"
+msgstr "شغل صوت عندما يسجل الدخول أحد جهات الاتصال"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show hint about closing the main window"
-msgstr "أظهر تلميحة إغلاق النافذة الرئيسية"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ما إذا سيشغل صوت عند ولوج متراسل إلى الشبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Show offline contacts"
-msgstr "أظهر المتراسلين غير المتَّصلين"
+msgid "Play a sound when a contact logs out"
+msgstr "شغل صوت عندما يقوم أحد المتراسلين بالخروج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show protocols"
-msgstr "أظهر البروتوكولات"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ما إذا سيشغل صوت عند خروج متراسل من الشبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Spell checking languages"
-msgstr "لغات التدقيق اللغوي"
+msgid "Play a sound when we log in"
+msgstr "شغل صوت عندما ألج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "The default folder to save file transfers in."
-msgstr "المجلد المبدئي لحفظ الملفات المنقولة فيه."
+msgid "Whether to play a sound when logging into a network."
+msgstr "ما إذا سيشغل صوت عند الولوج إلى شبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "The last directory that an avatar image was chosen from."
-msgstr "آخر مجلد اختِيرت منه الصورة الشخصية."
+msgid "Play a sound when we log out"
+msgstr "شغل صوت عندما أخرج"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The position for the chat window side pane"
-msgstr "موضع اللوحة الجانبية في نافذة الدردشة"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ما إذا سيشغل صوت عند الخروج من شبكة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "الموضع المحفوظ (بالبكسل) للّوحة الجانبية في نافذة الدردشة."
+msgid "Enable popup notifications for new messages"
+msgstr "فعّل التنبيهات المنبثقة للرسائل الجديدة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "السِمة المستخدمة لعرض المحادثة في نوافذ الدردشة."
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "ما إذا سيُعرض تنبيه منبثق عند استلام رسالة جديدة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Use graphical smileys"
-msgstr "استخدم التعابير المرسومة"
+msgid "Disable popup notifications when away"
+msgstr "عطل التنبيهات المنبثقة عندما أكون بعيدًا"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Use notification sounds"
-msgstr "استخدم أصوات التبليغ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ما إذا ستظهر التنبيهات عندما أكون بعيدا أو مشغولا."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Use theme for chat rooms"
-msgstr "استخدم سمة لغرف الدردشة"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "أظهر التنبيهات المنبثقة إذا لم يكن التركيز على المحادثة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "فيما إن كان إمبثي سيطلع المتراسلين على مكان المستخدم."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"ما إذا سيُعرض تنبيه منبثق عند استلام رسالة جديدة حتى إذا كانت الدردشة مفتوحة "
+"بالفعل لكن ليست في البؤرة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "فيما إذا كان إمبثي سيستخدم GPS لتخمين المكان."
+msgid "Pop up notifications when a contact logs in"
+msgstr "أظهر تنبيهات منبثقة عند ولوج المتراسل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "فيما إذا كان إمبثي سيستخدم شبكة الهاتف المحمول لتخمين المكان."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "ما إذا سيُعرض تنبيه منبثق عندما يصبح المتراسل على الخط."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "فيما إذا كان إمبثي سيستخدم الشبكة لتخمين المكان."
+msgid "Pop up notifications when a contact logs out"
+msgstr "أظهر تنبيهات منبثقة عند خروج المتراسل"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "فيما إذا كان إمبثي رحّل سجلات butterfly."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "ما إذا سيُعرض تنبيه منبثق عندما يصبح المتراسل غير متصل."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "فيما إذا كان على إمبثي الولوج آليا إلى حساباتك عند بدء التشغيل."
+msgid "Use graphical smileys"
+msgstr "استخدم التعابير المرسومة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "فيما إذا كان على إمبثي الانتقال إلى حالة بعيد تلقائيا عند السكون."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "فيما إذا يحول الابتسامات إلى صور معبّرة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "فيما إذا كان على إمبثي خفض دقة تحديد المكان للحفاظ على الخصوصية."
+msgid "Show contact list in rooms"
+msgstr "أظهر قائمة المتراسلين في الغرف"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "فيما إذا كان على إمبثي استخدام أفاتر المتراسل كأيقونة لنافذة المحادثة."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "عرض قائمة المتراسلين في غرف المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "فيما إذاكانت أدوات وِب‌كِت للمطور -مثل فاحص الوب- ستفعّل أم لا."
+msgid "Chat window theme"
+msgstr "سمة نافذة المحادثة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "فيما إذا يستخدم مدراء الشبكة لقطع الاتصال أو استرجاعه."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "السِمة المستخدمة لعرض المحادثة في نوافذ الدردشة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "فيما إذا كان عليه التأكد من الكلمات المكتوبة باللغة التي حددتها."
+msgid "Chat window theme variant"
+msgstr "شكل سِمة نافذة الدردشة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "فيما إذا يحول الابتسامات إلى صور معبّرة."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "شكل السمة المستخدمة لعرض المحادثة في نوافذ الدردشة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ما إذا سيشغل صوت عند ولوج متراسل إلى الشبكة."
+msgid "Path of the Adium theme to use"
+msgstr "مسار سمة Adium لتستخدم"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ما إذا سيشغل صوت عند خروج متراسل من الشبكة."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "مسار سمة Adium التي ستستخدم إذا كانت سمة الدردشة المستخدمة Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to play a sound to notify of events."
-msgstr "ما إذا سيشغل صوت للتنبيه عن الأحداث."
+msgid "Enable WebKit Developer Tools"
+msgstr "فعّل أدوات وب‌كِت للمطورين"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ما إذا سيشغل صوت عند وصول الرسائل."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "فيما إذاكانت أدوات وِب‌كِت للمطور -مثل فاحص الوب- ستفعّل أم لا."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "ما إذا سيشغل صوت للمحادثات الجديدة."
+msgid "Inform other users when you are typing to them"
+msgstr "أعلِم المُستخدمين الآخرين عندما تكتب لهم"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ما إذا سيشغل صوت عند إرسال الرسائل."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound when logging into a network."
-msgstr "ما إذا سيشغل صوت عند الولوج إلى شبكة."
+msgid "Use theme for chat rooms"
+msgstr "استخدم سمة لغرف الدردشة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ما إذا سيشغل صوت عند الخروج من شبكة."
+msgid "Whether to use the theme for chat rooms."
+msgstr "استخدام سمة لغرف المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ما إذا سيشغل صوت عندما أكون بعيدا أو مشغولا."
+msgid "Spell checking languages"
+msgstr "لغات التدقيق اللغوي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "ما إذا سيُعرض تنبيه منبثق عندما يصبح المتراسل غير متصل."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "قائمة لغات التدقيق الإملائي (افصل بفاصلة، مثال: \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "ما إذا سيُعرض تنبيه منبثق عندما يصبح المتراسل على الخط."
+msgid "Enable spell checker"
+msgstr "مكّن التدقيق الإملائي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"ما إذا سيُعرض تنبيه منبثق عند استلام رسالة جديدة حتى إذا كانت الدردشة مفتوحة "
-"بالفعل لكن ليست في البؤرة."
+"Whether to check words typed against the languages you want to check with."
+msgstr "فيما إذا كان عليه التأكد من الكلمات المكتوبة باللغة التي حددتها."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "ما إذا سيُعرض تنبيه منبثق عند استلام رسالة جديدة."
+msgid "Nick completed character"
+msgstr "مِحرف الكنية التام"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "إظهار صور شخصية للمتراسلين في لائحة المتراسلين ونوافذ المحادثة."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"المِحرف الذي يجب إضافته بعد الأسماء عند استعمال (Tab) لتكملة الأسماء في "
+"المحادثات الجماعية."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "عرض المرسلين غير المتصلين في لائحة المتراسلين."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "استخدام الصور الشخصيّة للمتراسل كأيقونة لنافذة المحادثة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ما إذا ستظهر التنبيهات عندما أكون بعيدا أو مشغولا."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "فيما إذا كان على إمبثي استخدام أفاتر المتراسل كأيقونة لنافذة المحادثة."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ما إذا ستُعرض بروتوكولات المتراسلين في القائمة."
+msgid "Last account selected in Join Room dialog"
+msgstr "آخر حساب تم تحديده في مربع حوار انضم لغرفة"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to show the contact list in chat rooms."
-msgstr "عرض قائمة المتراسلين في غرف المحادثة."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show the contact list in compact mode."
-msgstr "عرض قائمة المتراسلين في شكلها المختصر."
+msgid "Camera device"
+msgstr "جهاز الكاميرا"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"جهاز الكاميرا الافتراضي الذي سيستخدم في مكالمات الفيديو، مثال ‎/dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Camera position"
+msgstr "موضع الكاميرا"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid "Position the camera preview should be during a call."
+msgstr "ينبغي أن يضبط موضع معاينة الكاميرا أثناء المكالمة."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Echo cancellation support"
+msgstr "دعم إلغاء الصدى"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "لتمكين فلتر Pulseaudio لإلغاء الصدى."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Show hint about closing the main window"
+msgstr "أظهر تلميح إغلاق النافذة الرئيسية"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -418,234 +465,270 @@ msgstr ""
 "عرض حوار الرسائل حول إغلاق النافذة الرئيسية التي بها علامة الإغلاق في شريط "
 "العناوين."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to use the theme for chat rooms."
-msgstr "استخدام سمة لغرف المحادثة."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can publish the user's location"
+msgstr "يستطيع إمبثي نشر مكان المستخدم"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"المعيار المطلوب استخدامه لفرز لائحة المتراسلين. المفترض  الفرز حسب اسم "
-"المتراسل. يمكن أيضا استخدام معيار الحالة للفرز حسب حالة المتراسلين."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "فيما إن كان إمبثي سيطلع المتراسلين على مكان المستخدم."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "أدر حسابات التراسل والصوت عبر الشبكة"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the network to guess the location"
+msgstr "يستطيع إمبثي استخدام الشبكة لتخمين مكان المستخدم"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2242
-msgid "Messaging and VoIP Accounts"
-msgstr "حسابات التراسل"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "فيما إذا كان إمبثي سيستخدم الشبكة لتخمين المكان."
 
-#: ../libempathy/empathy-ft-handler.c:825
-msgid "File transfer completed, but the file was corrupted"
-msgstr "تم نقل الملف لكن الملف كان تالفا"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "يستطيع إمبثي استخدام شبكة الهاتف المحمول لتخمين مكان المستخدم"
 
-#: ../libempathy/empathy-ft-handler.c:1113
-msgid "File transfer not supported by remote contact"
-msgstr "لا يدعم المتراسل البعيد نقل الملفات"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "فيما إذا كان إمبثي سيستخدم شبكة الهاتف المحمول لتخمين المكان."
 
-#: ../libempathy/empathy-ft-handler.c:1169
-msgid "The selected file is not a regular file"
-msgstr "الملف المختار ليس ملفا اعتياديا"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "يستطيع إمبثي استخدام GPS لتخمين مكان المستخدم"
 
-#: ../libempathy/empathy-ft-handler.c:1178
-msgid "The selected file is empty"
-msgstr "الملف المختار فارغ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "فيما إذا كان إمبثي سيستخدم GPS لتخمين المكان."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "على إمبثي تقليل دقة تحديد المكان"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "نوع المقبس غير مدعوم"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "فيما إذا كان على إمبثي خفض دقة تحديد المكان للحفاظ على الخصوصية."
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "لم يحدد أي سبب"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "رفض تغيير الحالة"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "أنت ألغيت نقل الملف"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "الشخص الآخر قام بإلغاء نقل الملف"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "حدثت مشكلة أثناء محاولة نقل الملف"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "الشخص الآخر غير قادر على نقل الملف"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:382
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "سبب مجهول"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "تم نقل الملف لكن الملف كان تالفا"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "لا يدعم المتراسل البعيد نقل الملفات"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "الملف المختار ليس ملفا اعتياديا"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "الملف المختار فارغ"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#, c-format
+msgid "Missed call from %s"
+msgstr "مكالمة فائتة مِن %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "تم الاتصال بـ %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "مكالمة مِن %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "موجود"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "مشغول"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "غائب"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "خفي"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "غير متصل"
 
-#: ../libempathy/empathy-utils.c:315
-#: ../src/empathy-streamed-media-window.c:1904
-#: ../src/empathy-streamed-media-window.c:1905
-#: ../src/empathy-streamed-media-window.c:1906
-#: ../src/empathy-streamed-media-window.c:1907
-#: ../src/empathy-call-window.ui.h:18
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
 msgid "Unknown"
 msgstr "مجهول"
 
-#: ../libempathy/empathy-utils.c:354
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "لم يحدد أي سبب"
 
-#: ../libempathy/empathy-utils.c:356 ../libempathy/empathy-utils.c:412
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
-msgstr "الحالة محددة على غير متصل."
+msgstr "الحالة محددة على غير متصل"
 
-#: ../libempathy/empathy-utils.c:358 ../libempathy/empathy-utils.c:392
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "خطأ شبكي"
 
-#: ../libempathy/empathy-utils.c:360 ../libempathy/empathy-utils.c:394
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "فشل التحقق"
 
-#: ../libempathy/empathy-utils.c:362 ../libempathy/empathy-utils.c:396
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "خطأ في التعمية"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "الاسم مستخدم مسبقا"
+msgstr "الاسم مستخدم مسبقًا"
 
-#: ../libempathy/empathy-utils.c:366 ../libempathy/empathy-utils.c:398
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "الشهادة غير متوفرة"
 
-#: ../libempathy/empathy-utils.c:368 ../libempathy/empathy-utils.c:400
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "الشهادة غير موثوق بها"
 
-#: ../libempathy/empathy-utils.c:370 ../libempathy/empathy-utils.c:402
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
-msgstr "انتهت صلاحية الشهادة"
+msgstr "الشهادة منتهية الصلاحية"
 
-#: ../libempathy/empathy-utils.c:372 ../libempathy/empathy-utils.c:404
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "الشهادة غير نشطة"
 
-#: ../libempathy/empathy-utils.c:374 ../libempathy/empathy-utils.c:406
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "عدم تطابق الشهادة مع اسم الخادوم"
 
-#: ../libempathy/empathy-utils.c:376 ../libempathy/empathy-utils.c:408
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "عدم تطابق الشهادة مع التوقيع"
 
-#: ../libempathy/empathy-utils.c:378 ../libempathy/empathy-utils.c:410
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "شهادة موقعة ذاتيا"
 
-#: ../libempathy/empathy-utils.c:380
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "خطأ في الشهادة"
 
-#: ../libempathy/empathy-utils.c:414
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "التعمية غير متاحة"
 
-#: ../libempathy/empathy-utils.c:416
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "الشّهادة ليست صالحة"
 
-#: ../libempathy/empathy-utils.c:418
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "رُفِض الاتصال"
 
-#: ../libempathy/empathy-utils.c:420
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
-msgstr "تعذّر بناء الاتصال"
+msgstr "تعذّر تأسيس الاتصال"
 
-#: ../libempathy/empathy-utils.c:422
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "فُقِد الاتصال"
 
-#: ../libempathy/empathy-utils.c:424
-msgid "This resource is already connected to the server"
-msgstr "هذا المورد متصل مسبقا بالخادوم"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "هذا الحساب متصل حاليًا بالخادوم"
 
-#: ../libempathy/empathy-utils.c:426
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "استبدل الاتصال باتصال جديد باستخدام نفس المورِد"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
-msgstr "الحساب موجود مسبقا على الخادوم"
+msgstr "الحساب موجود مسبقًا على الخادوم"
 
-#: ../libempathy/empathy-utils.c:431
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
-msgstr "الحاسوب مشغول حاليا ولا يستطيع التعامل مع الاتصال"
+msgstr "الخادوم مشغول حاليًا ولا يستطيع التعامل مع الاتصال"
 
-#: ../libempathy/empathy-utils.c:433
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "نُقِضت الشهادة"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "تستخدم الشهادة خوارزمية تعمية غير آمنة أو ضعيفة"
 
-#: ../libempathy/empathy-utils.c:438
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
-"طول شهادة الخادوم أو عمق شبكة شهادة الخادوم تتجاوز الحد الذي تفرضه مكتبة "
-"التعمية."
+"طول شهادة الخادوم أو طول سلسلة الشهادات الخادوم تتجاوز الحد الذي تفرضه مكتبة "
+"التعمية"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "برنامجك قديم جدًا"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "خطأ داخلي"
 
-#: ../libempathy/empathy-utils.c:601
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "الأشخاص القريبون"
 
-#: ../libempathy/empathy-utils.c:606
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "ياهو! اليابان"
 
-#: ../libempathy/empathy-utils.c:635
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "جوجل توك"
 
-#: ../libempathy/empathy-utils.c:636
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "دردشة فيسبوك"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -656,7 +739,7 @@ msgstr[3] "منذ %d ثوان"
 msgstr[4] "منذ %d ثانية"
 msgstr[5] "منذ %d ثانية"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -667,7 +750,7 @@ msgstr[3] "منذ %d دقائق"
 msgstr[4] "منذ %d دقيقة"
 msgstr[5] "منذ %d دقيقة"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -678,7 +761,7 @@ msgstr[3] "منذ %d ساعات"
 msgstr[4] "منذ %d ساعة"
 msgstr[5] "منذ %d ساعة"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -689,7 +772,7 @@ msgstr[3] "منذ %d أيام"
 msgstr[4] "منذ %d يوما"
 msgstr[5] "منذ %d يوم"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -700,7 +783,7 @@ msgstr[3] "منذ %d أسابيع"
 msgstr[4] "منذ %d أسبوعا"
 msgstr[5] "منذ %d أسبوع"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -711,19 +794,18 @@ msgstr[3] "منذ %d أشهر"
 msgstr[4] "منذ %d شهرا"
 msgstr[5] "منذ %d شهر"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "في المستقبل"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:491
-msgid "All"
-msgstr "الكل"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "كل الحسابات"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../libempathy-gtk/empathy-log-window.c:643
-#: ../src/empathy-import-widget.c:321
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
-msgstr "حساب"
+msgstr "الحساب"
 
 #: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
@@ -739,307 +821,258 @@ msgstr "الخادوم"
 msgid "Port"
 msgstr "المنفذ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:757
-#: ../libempathy-gtk/empathy-account-widget.c:814
+#: ../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:1166
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "يُحرر الحساب %s في \"حسابات الوب\"."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1172
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "لا يمكن تحرير الحساب %s في إمبثي."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "Launch My Web Accounts"
-msgstr "شغّل \"حسابات الوب\""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1530
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "اسم المستخدم:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1897
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_طبّق"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1927
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_لُج"
 
-#. Account and Identifier
-#: ../libempathy-gtk/empathy-account-widget.c:1993
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:520
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1481
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "الحساب:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2004
-msgid "_Enabled"
-msgstr "_مفعّل"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2069
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "هذا الحساب موجود مسبقا على الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2072
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "أنشئ حسابا جديدا على الخادوم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2264
-msgid "Ca_ncel"
-msgstr "أ_لغِ"
-
 #. 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:2561
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "‏%1$s على %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2587
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "حساب %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2591
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "حساب جديد"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>مثال:</b> MyScreenName"
+#: ../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:"
+msgstr "كلمة ال_سر:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "متقدم"
+msgid "Screen _Name:"
+msgstr "الاسم الم_عروض:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>مثال:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "كلمة ال_سر:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "تذكّر كلمة السر"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Remember Password"
-msgstr "تذكر كلمة السر"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ال_منْفذ:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "تذكّر كلمة السر"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "الاسم الم_عروض:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "ال_خادوم:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "ما كلمة سرك على AIM؟"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "متقدم"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "ما اسم الشاشة في AIM؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ال_منْفذ:"
+msgid "What is your AIM password?"
+msgstr "ما كلمة سرك على AIM؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "ال_خادوم:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>مثال:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "تذكر كلمة السر"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "ا_سم المستخدم:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>مثال:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "ما معرّفك على GroupWise؟"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "ما كلمة سرك على GroupWise؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>مثال:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ال_ترمير:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ما معرفك على ICQ؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ما كلمة سرك على ICQ؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "تلقائي"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../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:221
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "سجّل"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "الخيارات"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "لا شيء"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "الترمير:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "الشبكة"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "الشبكة:"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "الترمير:"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "الخواديم"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"معظم خواديم IRC لا تحتاج كلمة مرور، لذا إذا لم تكن متأكدًا، لا تُدخل كلمة مرور."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "الاسم المستعار:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "رسالة الخروج:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "الاسم الحقيقي:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "الخواديم"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "أي شبكة IRC؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "What is your IRC nickname?"
 msgstr "ما كنية IRC التي تستخدمها؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Which IRC network?"
-msgstr "أي شبكة IRC؟"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>مثال:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>مثال:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ال_تعمية مطلوبة (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_تجاهل أخطاء شهادة SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "تجاوز إعدادات الخادوم"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "الأو_لويّة:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "الم_ورد:"
+msgid "What is your Facebook username?"
+msgstr "ما اسم مستخدمك على فيسبوك؟"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1051,192 +1084,233 @@ msgstr ""
 "استخدم <a href=\"http://www.facebook.com/username/\">هذه الصفحة</a> لاختيار "
 "اسم مستخدم على فيسبوك إذا لم يكن لك واحد."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "استعمل SS_L القديم"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "ما كلمة سرك على فيسبوك؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "ما اسم مستخدمك على فيسبوك؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "ما معرفك على جوجل؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>مثال:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "ما كلمة سرك على جوجل؟"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>مثال:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_تجاهل أخطاء شهادة SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "الأو_لويّة:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "الم_ورد:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ال_تعمية مطلوبة (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "استعمل SS_L القديم"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "تجاوز إعدادات الخادوم"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ما معرفك على جابِر؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "ما كلمة سرك على جابِر؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "ما المعرف الذي تريده على جابِر؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "ما كلمة سرك على جابِر؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "ما كلمة السر التي تريدها على جابِر؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>مثال:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "ما معرّفك على Windows Live؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "ما كلمة سرك على Windows Live؟"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_عنوان البريد:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "الا_سم المستعار:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "الاسم ال_عائلي:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "الا_سم الأول:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "الا_سم المنشور:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "معرّف _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "الاسم ال_عائلي:"
+msgid "E-_mail address:"
+msgstr "_عنوان البريد:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "الا_سم المنشور:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "اسم المست_خدم:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>مثال:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "اسم مستخدم الاستيثاق:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "اكتشف الارتباط"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "اكتشف خادوم STUN تلقائيا"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "استخدم هذا الحساب للاتصال بالهواتف الأر_ضية والهواتف الخليوية"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
-msgstr "المدة (بالثواني)"
+msgid "NAT Traversal Options"
+msgstr "خيارات انتقال NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Keep-Alive Options"
-msgstr "خيارات إبقاء الاتصال"
+msgid "Proxy Options"
+msgstr "خيارات الوسيط"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Loose Routing"
-msgstr "توجيه متراخي"
+msgid "Miscellaneous Options"
+msgstr "خيارات متنوعة"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Mechanism:"
-msgstr "الآلية:"
+msgid "STUN Server:"
+msgstr "خادوم STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Miscellaneous Options"
-msgstr "خيارات متنوعة"
+msgid "Discover the STUN server automatically"
+msgstr "اكتشف خادوم STUN تلقائيا"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "NAT Traversal Options"
-msgstr "خيارات انتقال NAT"
+msgid "Discover Binding"
+msgstr "اكتشف الارتباط"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "الخادوم:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Port:"
-msgstr "المنْفذ:"
+msgid "Keep-Alive Options"
+msgstr "خيارات إبقاء الاتصال"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Proxy Options"
-msgstr "خيارات الوسيط"
+msgid "Mechanism:"
+msgstr "الآلية:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr "المدة (بالثواني)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "اسم مستخدم الاستيثاق:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "STUN Server:"
-msgstr "خادوم STUN:"
+msgid "Transport:"
+msgstr "النقل:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "Server:"
-msgstr "الخادوم:"
+msgid "Loose Routing"
+msgstr "توجيه متراخي"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "Transport:"
-msgstr "النقل:"
+msgid "Ignore TLS Errors"
+msgstr "تجاهل أخطاء TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "What is your SIP account password?"
-msgstr "ما كلمة سر حسابك على SIP؟"
+msgid "Port:"
+msgstr "المنْفذ:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP login ID?"
 msgstr "ما معرف ولوجك على SIP؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "_Username:"
-msgstr "اسم المست_خدم:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "ما كلمة سر حسابك على SIP؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "مُعرّف _ياهو!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_تجاهل دعوات المؤتمرات وغرف الدردشة"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "محلية لائحة ال_غرف:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ما معرفك على ياهو!؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ما كلمة سرك على ياهو!؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "مُعرّف _ياهو"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "محلية لائحة ال_غرف:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:448
-#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "تعذّر تحويل الصورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ولا واحدة من المصور المقبولة مدعومة في نظامك"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:930
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "تعذّر حفظ الصورة إلى ملف"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "اختر صورتك الشخصية"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "التقط صورة..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "لا صورة"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:995
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "صور"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:999
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "كل الملفّات"
 
@@ -1244,43 +1318,73 @@ msgstr "كل الملفّات"
 msgid "Click to enlarge"
 msgstr "انقر للتكبير"
 
-#: ../libempathy-gtk/empathy-chat.c:652
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "حدث خطأ أثناء بدء المكالمة"
+
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "المتراسل المحدد لا يدعم المكالمات"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "المتراسل المحدد غير متصل"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "المتراسل المحدد غير صالح"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "مكالمات الطوارئ غير مدعومة على هذا البروتوكول"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "ليس لديك رصيدٌ كافٍ لإجراء هذه المكالمة"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "فشل فتح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:717
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "الموضوع غير مدعوم في هذه المحادثة"
 
-#: ../libempathy-gtk/empathy-chat.c:723
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "لا يُسمح لك بتغيير الموضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:906
+#: ../libempathy-gtk/empathy-chat.c:991
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "“%s” هو معرّف متراسل غير صالح"
+
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr ""
 "/clear:\n"
 "يمسح كل الرسائل من المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:909
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr ""
 "/topic <موضوع>:\n"
 "يحدد موضوع المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:912
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <معرّف غرفة دردشة>:\n"
 "انضم إلى غرفة دردشة جديدة"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <معرّف غرفة دردشة>:\n"
 "انضم إلى غرفة دردشة جديدة"
 
-#: ../libempathy-gtk/empathy-chat.c:920
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1288,31 +1392,31 @@ msgstr ""
 "/part [<معرّف غرفة دردشة>] ‎[<سبب>]:\n"
 "غادر غرفة الدردشة، الحالية إذا لم يحدد غيرها"
 
-#: ../libempathy-gtk/empathy-chat.c:925
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <معرّف متراسل>‎ [<رسالة>]:\n"
 "افتح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:928
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <معرّف متراسل>‎ <رسالة>:\n"
 "افتح دردشة خصوصية"
 
-#: ../libempathy-gtk/empathy-chat.c:931
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr ""
 "/nick <اسم مستعار>:\n"
 "غيّر اسمك المستعار على الخادوم الحالي"
 
-#: ../libempathy-gtk/empathy-chat.c:934
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <رسالة>:\n"
 "يرسل رسالة إجراء إلى المحادثة الحالية"
 
-#: ../libempathy-gtk/empathy-chat.c:937
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1322,7 +1426,11 @@ msgstr ""
 "يرسل <رسالة> إلى المحادثة الحالية. يستخدم هذا لإرسال رسالة تبدأ بشرطة مائلة "
 "'/'. مثلا: \"‪/say /join‬ تستخدم للانضمام إلى غرفة دردشة جديدة\""
 
-#: ../libempathy-gtk/empathy-chat.c:942
+#: ../libempathy-gtk/empathy-chat.c:1120
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: عرض معلومات حول متراسل"
+
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1330,111 +1438,139 @@ msgstr ""
 "/help [<أمر>]:\n"
 "اعرض كل الأوامر المدعومة. إذا كان <أمر> فسيعرض كيفية استخدامه."
 
-#: ../libempathy-gtk/empathy-chat.c:952
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "الاستخدام: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:991
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "أمرٌ مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:1117
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "أمرٌ مجهول؛ راجع ‪/help‬ لتعرف الأوامر المتاحة"
 
-#: ../libempathy-gtk/empathy-chat.c:1254
+#: ../libempathy-gtk/empathy-chat.c:1564
+msgid "insufficient balance to send message"
+msgstr "الرصيد غير كافٍ لإرسال رسالة"
+
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "خطأ في ارسال الرسالة '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "خطأ في إرسال الرسالة: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "رصيد غير كافٍ لإرسال رسالة. <a href='%s'>اشحن</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
+msgid "not capable"
+msgstr "غير قابل للتطبيق"
+
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "غير متّصل"
 
-#: ../libempathy-gtk/empathy-chat.c:1257
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "متراسل غير صحيح"
 
-#: ../libempathy-gtk/empathy-chat.c:1260
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "رُفض التّصريح"
 
-#: ../libempathy-gtk/empathy-chat.c:1263
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "الرسالة طويلة جدا"
 
-#: ../libempathy-gtk/empathy-chat.c:1266
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "غير مطبق"
 
-#: ../libempathy-gtk/empathy-chat.c:1270
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../libempathy-gtk/empathy-chat.c:1274
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "خطأ في ارسال الرسالة '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1335 ../src/empathy-chat-window.c:717
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "الموضوع:"
 
-#: ../libempathy-gtk/empathy-chat.c:1347
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "الموضوع: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1349
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "عيّن %s الموضوع: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "لم يحدد أي موضوع"
 
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(لا اقتراحات)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:1916
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "أضِف '%s' إلى القاموس"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:1953
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "أضِف '%s' إلى قاموس %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "أدرج التعابير المرسومة"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2028
-#: ../libempathy-gtk/empathy-ui-utils.c:1808
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "أ_رسل"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2063
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "ا_قتراحات الإملاء"
 
-#: ../libempathy-gtk/empathy-chat.c:2152
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "فشل جلب السجلات الحديثة"
 
-#: ../libempathy-gtk/empathy-chat.c:2263
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
-msgstr "‏%s قطع الاتصال"
+msgstr "‏قُطع الاتصال ب\"%s\""
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2270
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "‏طرد %1$s‏  %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2273
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "‏%s طُرِد"
@@ -1442,17 +1578,17 @@ msgstr "‏%s طُرِد"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2281
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "حظر  %1$s‏  %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2284
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "‏%s حُظِر"
 
-#: ../libempathy-gtk/empathy-chat.c:2288
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "‏%s غادر الغرفة"
@@ -1462,141 +1598,163 @@ msgstr "‏%s غادر الغرفة"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2297
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr "‏‏ (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2322
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "انضم %s إلى الغرفة"
 
-#: ../libempathy-gtk/empathy-chat.c:2347
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "يعرف %s الآن باسم %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2486
-#: ../src/empathy-streamed-media-window.c:1949
-#: ../src/empathy-event-manager.c:1122
+#. 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:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "غير متَصل"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3116
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "أترغب في حفظ كلمة السر هذه؟"
 
-#: ../libempathy-gtk/empathy-chat.c:3122
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "تذكّر"
 
-#: ../libempathy-gtk/empathy-chat.c:3132
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ليس الآن"
 
-#: ../libempathy-gtk/empathy-chat.c:3176
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "أعد المحاولة"
 
-#: ../libempathy-gtk/empathy-chat.c:3180
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "كلمة سر خطأ؛ من فضلك أعد المحاولة:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3297
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "هذه الغرفة محمية بكلمة سر:"
 
-#: ../libempathy-gtk/empathy-chat.c:3324
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "انضم"
 
-#: ../libempathy-gtk/empathy-chat.c:3494 ../src/empathy-event-manager.c:1144
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
 msgstr "متَصل"
 
-#: ../libempathy-gtk/empathy-chat.c:3547
-#: ../libempathy-gtk/empathy-log-window.c:650
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "محادثة"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:422
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4130
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "معرّف غير معروف أو غير سليم"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "منع المتراسلين غير متاح مؤقتا"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "منع المتراسلين غير متاح"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "رُفِض الإذن"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "تعذّر منع المتراسِل"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:701
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "حرّر المتراسلين الممنوعين"
 
+#. 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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "الحساب:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "المتراسلين الممنوعين"
+
+#: ../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
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "إزالة"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:794
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ا_نسخ عنوان الوصلة"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:801
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ا_فتح الوصلة"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "عدّل معلومات المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "المعلومات الشخصية"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "متراسل جديد"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:532
-#: ../libempathy-gtk/empathy-individual-dialogs.c:199
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "أأمنع %s؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:537
-#: ../libempathy-gtk/empathy-individual-dialogs.c:247
+#: ../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 "أمتأكد أنك تريد منع '%s' من مراسلتك مرة أخرى؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:542
-#: ../libempathy-gtk/empathy-individual-dialogs.c:269
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ا_منع"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:552
-#: ../libempathy-gtk/empathy-individual-dialogs.c:278
+#: ../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] "أ_بلع عن أن هذا المتراسل مؤذٍ"
@@ -1607,371 +1765,315 @@ msgstr[4] "أ_بلع عن أن هؤلاء المتراسلين مؤذين"
 msgstr[5] "أ_بلع عن أن هؤلاء المتراسلين مؤذين"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_سأقرر لاحقًا"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "طلب تسجيل"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ا_منع المستخدم"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "غير مجمّع"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "الأشخاص المفضّلين"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2001
-#: ../libempathy-gtk/empathy-individual-view.c:2336
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2003
-#: ../libempathy-gtk/empathy-individual-view.c:2339
-msgid "Removing group"
-msgstr "إزالة مجموعة"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2052
-#: ../libempathy-gtk/empathy-contact-list-view.c:2129
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2588
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "أ_زل"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2082
-#: ../libempathy-gtk/empathy-individual-view.c:2458
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2084
-#: ../libempathy-gtk/empathy-individual-view.c:2479
-msgid "Removing contact"
-msgstr "حذف المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:219
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Add Contact…"
-msgstr "أ_ضف متراسلا…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:296
-msgid "_Block Contact"
-msgstr "ا_منع المتراسل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:325
-#: ../libempathy-gtk/empathy-individual-menu.c:517
-#: ../src/empathy-main-window.ui.h:15
-msgid "_Chat"
-msgstr "_دردشة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:356
-#: ../libempathy-gtk/empathy-individual-menu.c:560
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_مكالمة صوتية"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:387
-#: ../libempathy-gtk/empathy-individual-menu.c:602
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_مكالمة مرئية"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:433
-#: ../libempathy-gtk/empathy-individual-menu.c:645
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Previous Conversations"
-msgstr "المحادثات ال_سابقة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:455
-#: ../libempathy-gtk/empathy-individual-menu.c:686
-msgid "Send File"
-msgstr "أرسل ملفا"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:478
-#: ../libempathy-gtk/empathy-individual-menu.c:728
-msgid "Share My Desktop"
-msgstr "شارك سطح مكتبي"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:518
-#: ../libempathy-gtk/empathy-contact-widget.c:1763
-#: ../libempathy-gtk/empathy-individual-menu.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "مفضّل"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-#: ../libempathy-gtk/empathy-individual-menu.c:791
-msgid "Infor_mation"
-msgstr "_معلومات"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:593
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_حرّر"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:647
-#: ../libempathy-gtk/empathy-individual-menu.c:972
-#: ../src/empathy-chat-window.c:935
-msgid "Inviting you to this room"
-msgstr "يدعوك إلى هذه الغرفة"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:678
-#: ../libempathy-gtk/empathy-individual-menu.c:1019
-msgid "_Invite to Chat Room"
-msgstr "ا_دع إلى غرفة المحادثة"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_سأقرر لاحقًا"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:513
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ابحث عن المتراسلين"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:543
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "ابحث:"
+msgstr "ابحث: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:601
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "أ_ضف متراسلا"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:619
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "لم يُعثَر على متراسلين"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "حدد متراسلا"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:295
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "الاسم الكامل:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:296
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "رقم الهاتف:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:297
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "عنوان البريد:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:298
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "موقع الإنترنت:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:299
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "يوم الميلاد:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "رسالتك لتقديم نفسك:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "الرجاء دعني أرى عندما تكون متصلًا. شكرًا!"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "القنوات:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "رمز البلد"
+msgstr "رمز البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "البلد:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "الولاية:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "المدينة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "المنطقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "الرمز البريدي:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "الشارع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "المبنى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "الطابق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "الغرفة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "النص:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "الوصف:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "المسار:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "مستوى الدقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "خطأ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "خطأ رأسي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:794
-#: ../libempathy-gtk/empathy-individual-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "خطأ أفقي (أمتار):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:796
-#: ../libempathy-gtk/empathy-individual-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "السرعة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:798
-#: ../libempathy-gtk/empathy-individual-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "الطريقة:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:800
-#: ../libempathy-gtk/empathy-individual-widget.c:526
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "سرعة التسلّق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:802
-#: ../libempathy-gtk/empathy-individual-widget.c:528
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "آخر تحديث:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:804
-#: ../libempathy-gtk/empathy-individual-widget.c:530
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "خط الطول:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:806
-#: ../libempathy-gtk/empathy-individual-widget.c:532
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "دائرة العرض:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:808
-#: ../libempathy-gtk/empathy-individual-widget.c:534
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "الارتفاع:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:871
-#: ../libempathy-gtk/empathy-contact-widget.c:888
-#: ../libempathy-gtk/empathy-individual-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:633
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "المكان"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:890
-#: ../libempathy-gtk/empathy-individual-widget.c:635
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "‏%s، ‏%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:942
-#: ../libempathy-gtk/empathy-individual-widget.c:684
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B، %Y في %R ت‌ع‌م"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1024
-#: ../libempathy-gtk/empathy-individual-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "احفظ الصور الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1080
-#: ../libempathy-gtk/empathy-individual-widget.c:977
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "لا يمكن حفظ الصورة الشخصية"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>المكان</b> في (تاريخ)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1307
-msgid "Alias:"
-msgstr "الكنية:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "معلومات العميل"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "العميل:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "التفاصيل الشخصية"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "تفاصيل المتراسل"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "الاسم الكامل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "رقم الهاتف"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "عنوان البريد الإلكتروني"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "موقع الويب"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "الميلاد"
+
+#. 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 "آخر ظهور:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "متصل من:"
+
+#. 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 "رسالة الغياب:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "عمل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "المنزل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "محمول"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "صوت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "المفضّل"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "البريدي"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "الطرد"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1511
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "المعرف:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "الكنية:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>المكان</b> في (تاريخ)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "معلومات مطلوبة…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "معلومات العميل"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "نظام التشغيل:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "الإصدارة:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:332
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "العميل:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "المجموعات"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:344
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -1979,21 +2081,21 @@ msgstr ""
 "انتقِ المجموعات التي تود أن يظهر فيها هذا المتراسل، يمكنك انتقاء أكثر من "
 "مجموعة أو لا مجموعة."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:363
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "أ_ضف مجموعة"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:398
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "حدّد"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:408
-#: ../src/empathy-main-window.c:1436
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "المجموعة"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "المعرفّات التالية ستُمنع:"
@@ -2003,7 +2105,7 @@ msgstr[3] "المعرفّات التالية ستُمنع:"
 msgstr[4] "المعرفّات التالية ستُمنع:"
 msgstr[5] "المعرفّات التالية ستُمنع:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:259
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "المعرفّات التالية لن تُمنع:"
@@ -2013,48 +2115,141 @@ msgstr[3] "المعرفّات التالية لن تُمنع:"
 msgstr[4] "المعرفّات التالية لن تُمنع:"
 msgstr[5] "المعرفّات التالية لن تُمنع:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
-msgid "Linked Contacts"
-msgstr "المتراسلين المترابطين"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:354
-msgid "Select contacts to link"
-msgstr "حدد متراسلا لربطه"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:428
-msgid "New contact preview"
-msgstr "معاينة متراسل جديد"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:472
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "المتراسلين المحددين في القائمة على اليمين سيربطون إلى بعضهم البعض."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "عدّل معلومات المتراسل"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:131
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "‏%s ‏(%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:839
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "حدد حسابًا ليستخدم لبدء المكالمة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "اتصل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "محمول"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "عمل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "المنزل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "ا_منع المتراسل"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_دردشة"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_مكالمة صوتية"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_مكالمة مرئية"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "المحادثات ال_سابقة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "أرسل ملفا"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "شارك سطح مكتبي"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "مفضّل"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "‏gnome-contacts غير مثبّت"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "رجاءً ثبّت gnome-contacts للوصول لتفاصيل المتراسلين."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_معلومات"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_حرر"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:865
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "ا_ربط المتراسلين…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "يدعوك إلى هذه الغرفة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "ا_دع إلى غرفة المحادثة"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "أ_ضف متراسلا…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "احذف وا_منع"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2467
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "هل ترغب حقا بإزالة المجموعة '%s'؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "إزالة مجموعة"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "أ_زل"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "هل ترغب حقا بإزالة المتراسل '%s'؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2063,38 +2258,42 @@ msgstr ""
 "أتريد حقا حذف المتراسل المرتبط '%s'؟ لاحظ أن هذا سيحذف كل المتراسلين التي "
 "يتشكل منها."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1652
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "حذف المتراسل"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "متراسل مرتبط لا يحتوي أي متراسلين"
-msgstr[1] "متراسل مرتبط يحتوي متراسل واحد"
-msgstr[2] "متراسل مرتبط يحتوي متراسليْن"
-msgstr[3] "متراسل مرتبط يحتوي %u متراسلين"
-msgstr[4] "متراسل مرتبط يحتوي %u متراسلا"
-msgstr[5] "متراسل مرتبط يحتوي %u متراسل"
+msgstr[0] "متراسل مرتبط لا يحوي أي مراسلين"
+msgstr[1] "متراسل مرتبط يحوي مراسلا واحدا"
+msgstr[2] "متراسل مرتبط يحوي مراسليْن"
+msgstr[3] "متراسل مرتبط يحوي %u مراسلين"
+msgstr[4] "متراسل مرتبط يحوي %u مراسلا"
+msgstr[5] "متراسل مرتبط يحوي %u مراسل"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "<b>المكان</b> في (تاريخ)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "متصل من هاتف محمول أو جهاز نقال آخر"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "شبكة جديدة"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "اختر شبكة IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "صفِّر قائمة ال_شبكات"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "اختر"
@@ -2107,112 +2306,258 @@ msgstr "خادوم جديد"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "اربط المتراسلين"
+#: ../libempathy-gtk/empathy-log-window.c:620
+msgid "History"
+msgstr "التأريخ"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ا_فصل…"
+#: ../libempathy-gtk/empathy-log-window.c:675
+msgid "Show"
+msgstr "أعرض"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "افصل المتراسل المرتبط المعروض إلى متراسلين منفصلين."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ار_بط"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-log-window.c:697
+msgid "Search"
+msgstr "ابحث"
+
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "أأفصل المتراسلين المرتبطين '%s'؟"
+msgid "Chat in %s"
+msgstr "دردشة في %s"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"أمتأكد من رغبتك في فصل هؤلاء المتراسلين المرتبطين؟ هذا سيفصل المتراسلين "
-"المرتبطين إلى كل على حدة."
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat with %s"
+msgstr "دردشة مع %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1289
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1295
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "ثانية"
+msgstr[1] "منذ ثانية واحدة"
+msgstr[2] "منذ ثانيتين"
+msgstr[3] "منذ %s ثوان"
+msgstr[4] "منذ %s ثانية"
+msgstr[5] "منذ %s ثانية"
+
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "دقيقة"
+msgstr[1] "منذ دقيقة واحدة"
+msgstr[2] "منذ دقيقتين"
+msgstr[3] "منذ %s دقائق"
+msgstr[4] "منذ %s دقيقة"
+msgstr[5] "منذ %s دقيقة"
+
+#: ../libempathy-gtk/empathy-log-window.c:1386
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "المكالمة استغرقت %s، انتهت في %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1720
+msgid "Today"
+msgstr "اليوم"
+
+#: ../libempathy-gtk/empathy-log-window.c:1724
+msgid "Yesterday"
+msgstr "بالأمس"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
+msgid "Anytime"
+msgstr "أي وقت"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
+msgid "Anyone"
+msgstr "أي شخص"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "ا_فصل"
+#: ../libempathy-gtk/empathy-log-window.c:2713
+msgid "Who"
+msgstr "من"
 
-#: ../libempathy-gtk/empathy-log-window.c:660
-msgid "Date"
-msgstr "التاريخ"
+#: ../libempathy-gtk/empathy-log-window.c:2922
+msgid "When"
+msgstr "متى"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "Anything"
+msgstr "أي شيء"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Text chats"
+msgstr "دردشات نصية"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "مكلمات"
+
+#: ../libempathy-gtk/empathy-log-window.c:3047
+msgid "Incoming calls"
+msgstr "مكالمات واردة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3048
+msgid "Outgoing calls"
+msgstr "مكالمات صادرة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Missed calls"
+msgstr "مكالمات فائتة"
+
+#: ../libempathy-gtk/empathy-log-window.c:3071
+msgid "What"
+msgstr "ماذا"
+
+#: ../libempathy-gtk/empathy-log-window.c:3780
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "هل أنت متأكد بأنك تريد حذف جميع سجلات المحادثات السابقة؟"
+
+#: ../libempathy-gtk/empathy-log-window.c:3784
+msgid "Clear All"
+msgstr "مسح الكل"
+
+#: ../libempathy-gtk/empathy-log-window.c:3791
+msgid "Delete from:"
+msgstr "حذف من:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_ملف"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Conversations"
-msgstr "محادثات"
+#: ../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 "ت_حرير"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "ابحث عن التالي"
+msgid "Delete All History..."
+msgstr "حذف كل التاريخ..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "ابحث عن السابق"
+msgid "Profile"
+msgstr "صفحة شخصية"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-msgid "Previous Conversations"
-msgstr "المحادثات السابقة"
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "محادثة"
 
-#. Tab Label
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "Search"
-msgstr "ابحث"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "فديو"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "صفحة 2"
 
-#. Searching *for* something
 #: ../libempathy-gtk/empathy-log-window.ui.h:9
-msgid "_For:"
-msgstr "_عن:"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">جار التحميل...</span>"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "معرّف المتراسل:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "المتراسل غير متّصل"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:171
-msgid "C_hat"
-msgstr "ا_بدأ محادثة"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "المتراسل المحدد إما غير صالح أو مجهول"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "المتراسل لايدعم هذا النوع من المحادثة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "الوظيفة المطلوبة غير مجهزّة لهذا البروتوكول"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "تعذر بدء محادثة مع المتراسل المحدد"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "أنت ممنوع في هذه القناة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "هذه القناة ممتلئة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "لا بُد أن تكون مدعوًا لكي تنضم لهذه القناة"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "لا يمكن المتابعة خلال انقطاع الاتصال"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "رُفض التّصريح"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "حدث خطأ أثناء بدء المحادثة"
+
+#: ../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 "أدخل مُعرِّف المتراسل أو رقم الهاتف:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:181
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "محادثة جديدة"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:253
-msgid "Send _Video"
-msgstr "أرسل _فيديو"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "مكالمة مرئ_ية"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:261
-msgid "C_all"
-msgstr "ا_تصل"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "مكالمة صو_تية"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:271
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "مكالمة جديدة"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "فَشِل الاستيثاق للحساب <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"
@@ -2227,34 +2572,30 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "رسالة مخصّصة…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "حرر الرسائل المخصّصة…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "انقر لإزالة كون هذه الحالة هي المفضلة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "انقر لجعل هذه الحالة هي المفضلة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "حدد الحالة"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
-msgid "Set your presence and current status"
-msgstr "حدد تواجدك وحالتك الحالية"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "الرسائل المخصصة…"
 
@@ -2262,18 +2603,26 @@ msgstr "الرسائل المخصصة…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "حساب %s جديد"
 
-#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "ابحث:"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "ال_سابق"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "ال_تالي"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "طابِق حالة الأحرف"
+msgid "Mat_ch case"
+msgstr "_طابق حالة الأحرف"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
@@ -2297,7 +2646,7 @@ msgstr "اتصل المتراسل"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
-msgstr "قطع المتراسل اتصاله"
+msgstr "قُطع الاتصال بالمتراسل"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
@@ -2319,35 +2668,32 @@ msgstr "مكالمة صوتية صادرة"
 msgid "Voice call ended"
 msgstr "أنهيت المكالمة الصوتية"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "حرر الرسالة المخصّصة"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "حرر الرسائل المخصّصة"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "احفظ رسالة _حالة جديدة"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "حُرِرَت الرسالة في %s"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "رسائل الحالة المحفوظة"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "عادي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "تقليدي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "بسيط"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "نظيف"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "أزرق"
 
@@ -2407,41 +2753,45 @@ msgid "Certificate hostname: %s"
 msgstr "اسم المستضيف في الشهادة: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "أكمل"
+msgid "C_ontinue"
+msgstr "أ_كمل"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "اتصال غير موثوق به"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "الاتصال غير موثوق. أتريد المتابعة بغض النظر عن هذا؟"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "تذكر هذا الاختيار للاتصالات المستقبلية"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "تفاصيل الشهادة"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1705
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "تعذّر فتح المسار"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1800
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "اختر ملفا"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "لا توجد مساحة خالية كفاية لحفظ الملف"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "مطلوب %s مساحة خالية لحفظ الملف لكن لا يتوفر إلا %s. اختر مكانا آخر."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1924
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "ملف وارد من %s"
@@ -2613,39 +2963,31 @@ msgstr "غربي"
 msgid "Vietnamese"
 msgstr "فيتنامي"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "المُتراسل المحدد لا يستطيع استقبال ملفات."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "المتراسل المحدد غير متّصل."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "لا رسالة خطأ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "رسالة فورية (إمبَثي)"
 
-#: ../src/empathy.c:308
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "لا تتصل عند بدء التشغيل"
 
-#: ../src/empathy.c:312
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "لا تعرض قائمة المتراسلين أو أي حوارات أخرى عند بدء التشغيل"
 
-#: ../src/empathy.c:320
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- المرسال إمبثي"
 
-#: ../src/empathy.c:499
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "عُطل أثناء الاتصال بمدير الحسابات"
 
-#: ../src/empathy.c:501
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2686,14 +3028,14 @@ msgid ""
 msgstr ""
 "من المفترض أنك تلقيت نسخة من رخصة جنو العمومية مع هذا البرنامج؛ إذا لم يحدث "
 "هذا فاكتب إلى:\n"
-"Free Software Fondation Inc., 59 Temple Place - Suite 330, Boston, MA 02111 "
-"- 1307, USA"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "عميل مراسلة فورية لجنوم"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "فريق عربآيز للترجمة http://www.arabeyes.org :\n"
@@ -2703,218 +3045,80 @@ msgstr ""
 "محمد الحبيِّب\t<mih1406@gmail.com>\n"
 "خالد حسني\t<khaledhosny@eglug.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "حدث خطأ أثناء استيراد الحسابات."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "حدث خطأ أثناء تحليل تفاصيل الحساب."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "حدث خطأ أثناء إنشاء الحساب."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "حدث خطأ."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "رسالة الخطأ: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"يمكنك إما العودة للخلف ومحاولة إدخال تفاصيل الحساب مرة ثانية، أو إغلاق هذا "
-"المساعد وإضافة الحساب لاحقا من قائمة \"تحرير\"."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "حدث خطأ"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "ما نوع حساب الدردشة الذي تمتلكه؟"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "ألديك حساب دردشة آخر تريد إعداده؟"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "أدخل تفاصيل الحساب"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "ما نوع حساب الدردشة الذي تريد إنشاءه؟"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "هل تريد إنشاء حسابات دردشة أخرى؟"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "أدخل تفاصيل الحساب الجديد"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"مع إمبثي تستطيع الدردشة مع أصدقائك وزملائك الذين يستخدمون جوجل توك، أو AIM، "
-"أو Windows Live والكثير من برامج الدردشة الأخرى. وباستخدام ميكروفون وكاميرا "
-"تستطيع إجراء محادثات بالصوت والصورة."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "هل لديك حساب كنت تستخدمه مع برنامج دردشة آخر؟"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "نعم، استورد معلومات حسابي من "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "نعم، سأُدخل معلومات حسابي الآن"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "لا، أريد حسابا جديدا"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "لا، حاليا أريد رؤية الأشخاص المتصلين قريبا مني فقط"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "اختر الحسابات التي تريد استيرادها:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
-msgid "Yes"
-msgstr "نعم"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "لا، يكفي هذا الآن"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"يستطيع إمبثي أن يكتشف تلقائيا ويفتح محادثة مع الأشخاص المتصلين معك على نفس "
-"الشبكة. إذا أردت استخدام هذه الخاصية فتأكد من أن التفاصيل أدناه صحيحة. يمكنك "
-"تغيير هذه التفاصيل بسهولة لاحقا أو حتى تعطيل هذه الخاصية من حوار 'الحسابات'."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "تحرير⇐الحسابات"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "لا أريد _تفعيل هذه الخاصية الآن"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"لن تستطيع الدردشة مع الأشخاص المتصلين معك على نفس الشبكة، لأن telepathy-"
-"salut غير مثبت. إذا أردت تفعيل هذه الخاصية فمن فضلك ثبّت حزمة telepathy-salut "
-"ثم أنشئ حساب 'أشخاص قريبون' من حوار 'الحسابات"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "‏telepathy-salut غير مثبت"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "مساعد حسابات التراسل والصوت عبر الشبكة"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "مرحبا مع إمبثي"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "استورد حساباتك الموجودة"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "من فضلك أدخل بيانات الشخصية"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "توجد تغييرات غير محفوظة في حساب %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "لم يُحفظ حسابك بعد."
 
-#: ../src/empathy-accounts-dialog.c:286
-#: ../src/empathy-streamed-media-window.c:809
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "يتّصل…"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "غير متصل — %s"
 
-#: ../src/empathy-accounts-dialog.c:339
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
-msgstr "قطع الاتصال — %s"
+msgstr "قُطع الاتصال — %s"
 
-#: ../src/empathy-accounts-dialog.c:350
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "غير متصل — لا اتصال شبكي"
 
-#: ../src/empathy-accounts-dialog.c:357
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "حالة مجهول"
 
-#: ../src/empathy-accounts-dialog.c:369
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"تم تعطيل هذا الحساب لاعتماده على قاعدة قديمة غير مدعومة. رجاءً ثبت telepathy-"
+"haze وأعِد تشغيل الجلسة لترحيل الحساب."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "غير متصل — عُطّل الحساب"
 
-#: ../src/empathy-accounts-dialog.c:772
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
-"أمُتأكد أنك ترغب في إتمام العملية؟"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "تعديل عوامل الاتصال"
 
-#: ../src/empathy-accounts-dialog.c:1133
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "فشل في جلب معلوماتك الشخصية من الخادوم."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "اتصل لتعديل معلوماتك الشخصية."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_عدّل عوامل الاتصال..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "هل ترغب بإزالة %s من حاسوبك؟"
 
-#: ../src/empathy-accounts-dialog.c:1137
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "لن يزيل هذا حسابك على الخادوم."
 
-#: ../src/empathy-accounts-dialog.c:1375
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2923,15 +3127,23 @@ msgstr ""
 "أمُتأكد أنك ترغب في إتمام العملية؟"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_فعّل"
 
-#: ../src/empathy-accounts-dialog.c:1572
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_عطّل"
 
-#: ../src/empathy-accounts-dialog.c:2086
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_تخطي"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "ات_صل "
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2940,18 +3152,18 @@ msgstr ""
 "أمُتأكد أنك ترغب في إتمام العملية؟"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr "يحمّل معلومات الحساب"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr "لم يثبّت أي بروتوكول"
+msgid "Add…"
+msgstr "أضف…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Protocol:"
-msgstr "البروتوكول:"
+msgid "_Import…"
+msgstr "ا_ستورد…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Loading account information"
+msgstr "يحمّل معلومات الحساب"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2959,272 +3171,200 @@ msgstr ""
 "لإضافة حساب جديد، عليك أولا بتثبيت الخلفية المناسبة لكل بروتوكول تود "
 "استعماله."
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "أ_ضف…"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import…"
-msgstr "ا_ستورد…"
+#, fuzzy
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "لم يثبّت أي بروتوكول"
 
-#: ../src/empathy-auth-client.c:246
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - عميل استيثاق إمبثي"
 
-#: ../src/empathy-auth-client.c:262
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "عميل استيثاق إمبثي"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "مع أصدقاء"
-
-#: ../src/empathy-av.c:118
-msgid "- Empathy Audio/Video Client"
-msgstr "- المرسال إمبثي"
-
-#: ../src/empathy-av.c:134
-msgid "Empathy Audio/Video Client"
-msgstr "المرسال إمبثي"
-
-#: ../src/empathy-streamed-media-window.c:479
-msgid "Contrast"
-msgstr "التباين"
-
-#: ../src/empathy-streamed-media-window.c:482
-msgid "Brightness"
-msgstr "السطوع"
-
-#: ../src/empathy-streamed-media-window.c:485
-msgid "Gamma"
-msgstr "جاما"
-
-#: ../src/empathy-streamed-media-window.c:590
-msgid "Volume"
-msgstr "الحجم"
-
-#: ../src/empathy-streamed-media-window.c:1166
-msgid "_Sidebar"
-msgstr "الشريط ال_جانبي"
-
-#: ../src/empathy-streamed-media-window.c:1186
-msgid "Audio input"
-msgstr "مدخلات الصوت"
-
-#: ../src/empathy-streamed-media-window.c:1190
-msgid "Video input"
-msgstr "مدخلات الفيديو"
-
-#: ../src/empathy-streamed-media-window.c:1194
-msgid "Dialpad"
-msgstr "لوحة الأرقام"
-
-#: ../src/empathy-streamed-media-window.c:1205
-msgid "Details"
-msgstr "التفاصيل"
-
-#. 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:1274
-#, c-format
-msgid "Call with %s"
-msgstr "اتصل باستخدام %s"
-
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-streamed-media-window.c:1353
-msgid "Call"
-msgstr "اتصل"
-
-#: ../src/empathy-streamed-media-window.c:1507
-msgid "The IP address as seen by the machine"
-msgstr "رقم الإنترنت كما يراه الجهاز"
-
-#: ../src/empathy-streamed-media-window.c:1509
-msgid "The IP address as seen by a server on the Internet"
-msgstr "رقم الإنترنت كما يراه خادوم على الإنترنت"
-
-#: ../src/empathy-streamed-media-window.c:1511
-msgid "The IP address of the peer as seen by the other side"
-msgstr "رقم الإنترنت للند كما يُرى على الجانب الآخر"
-
-#: ../src/empathy-streamed-media-window.c:1513
-msgid "The IP address of a relay server"
-msgstr "رقم الإنترنت لخادوم تقوية"
-
-#: ../src/empathy-streamed-media-window.c:1515
-msgid "The IP address of the multicast group"
-msgstr "رقم الإنترنت لمجموعة توصيل متعدد"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2266
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "متَصل — %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2327
-msgid "Technical Details"
-msgstr "التفاصيل التقنية"
-
-#: ../src/empathy-streamed-media-window.c:2365
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr "برمجية %s لا تفهم أيا من أنساق الصوت المدعومة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2370
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr "برمجية %s لا تفهم أيا من أنساق الفيديو المدعومة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2376
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"تعذّر إنشاء اتصال مع %s. قد يكون أحدكما في شبكة لا تسمح بالاتصالات المباشرة."
-
-#: ../src/empathy-streamed-media-window.c:2382
-msgid "There was a failure on the network"
-msgstr "حدث عطل في الشبكة"
-
-#: ../src/empathy-streamed-media-window.c:2386
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "أنساق الصوت المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2389
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "أنساق الفديو المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
-
-#: ../src/empathy-streamed-media-window.c:2399
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"حدث أمر غير متوقع في مكون تليباثي. من فضلك <a href=\"%s\">أبلغ عن هذه العلة</"
-"a> وأرفق السجل المجمع في نافذة 'نقح' من قائمة 'مساعدة'."
-
-#: ../src/empathy-streamed-media-window.c:2407
-msgid "There was a failure in the call engine"
-msgstr "حدث عطل في محرك الاتصالات"
-
-#: ../src/empathy-streamed-media-window.c:2410
-msgid "The end of the stream was reached"
-msgstr "وُصِل إلى نهاية الدفق"
-
-#: ../src/empathy-streamed-media-window.c:2450
-msgid "Can't establish audio stream"
-msgstr "تعذر بناء دفق الصوت"
-
-#: ../src/empathy-streamed-media-window.c:2460
-msgid "Can't establish video stream"
-msgstr "تعذر بناء دفق الفديو"
-
 #: ../src/empathy-call-window.ui.h:1
-msgid "Audio"
-msgstr "صوت"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "اتصل بالمتراسل ثانيا"
+msgid "_Call"
+msgstr "_اتصال"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "عطل الكمرة"
+msgid "_Microphone"
+msgstr "_الميكروفون"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "فعّل الكمرة"
+msgid "_Camera"
+msgstr "_الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "مرماز الفك:"
+msgid "_Settings"
+msgstr "إ_عدادات"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "عطل الكمرة وتوقف عن إرسال الفديو"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "_View"
+msgstr "_عرض"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "فعّل الكمرة وأرسل فديو"
+#: ../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 "م_ساعدة"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "فعّل الكمرة ولا ترسل فديو"
+#: ../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 "الم_حتويات"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "مرماز الترميز:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_نقّح"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "علّق"
+msgid "Swap camera"
+msgstr "تبديل الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "علّق المكالمة الحالية"
+msgid "Minimise me"
+msgstr "تصغير"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "المرشح المحلي:"
+msgid "Maximise me"
+msgstr "تكبير"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "معاينة"
+msgid "Disable camera"
+msgstr "عطّل الكاميرا"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "أعِد الاتصال"
+msgid "Hang up"
+msgstr "علّق"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "المرشح البعيد:"
+msgid "Hang up current call"
+msgstr "علّق المكالمة الحالية"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "أرسل ملف صوتي"
+msgid "Video call"
+msgstr "مكالمة فيديو"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "بدل نقل الصوت"
+msgid "Start a video call"
+msgstr "ابدأ مكالمة فيديو"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "_فديو"
+msgid "Start an audio call"
+msgstr "ابدأ مكالمة صوتية"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "فديو"
+msgid "Show dialpad"
+msgstr "أظهر لوح اتصال"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "عطّل الفديو"
+msgid "Display the dialpad"
+msgstr "اعرض لوح الاتصال"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "فعّل الفديو"
+msgid "Send Video"
+msgstr "إرسال فيديو"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "معاينة الفيديو"
+msgid "Toggle video transmission"
+msgstr "بدل نقل الفيديو"
 
 #: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "_اتصال"
+msgid "Send Audio"
+msgstr "أرسل ملف صوتي"
 
-#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:29
-msgid "_View"
-msgstr "_عرض"
+#: ../src/empathy-call-window.ui.h:25
+msgid "Toggle audio transmission"
+msgstr "بدل نقل الصوت"
 
-#: ../src/empathy-chat-window.c:474 ../src/empathy-chat-window.c:494
+#: ../src/empathy-call-window.ui.h:27
+msgid "Encoding Codec:"
+msgstr "مرماز الترميز:"
+
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538 ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "مجهول"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "مرماز الفك:"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "Remote Candidate:"
+msgstr "المرشح البعيد:"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "Local Candidate:"
+msgstr "المرشح المحلي:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+msgid "Audio"
+msgstr "صوت"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "هل تريد غلق هذه النافذة؟"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"بإغلاقك لهذه النافذة ستغادر الغرفة %s. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لها مُجددا."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] " "
+msgstr[1] ""
+"بإغلاقك لهذه النافذة ستغادر غرفة واحدة. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لها مُجددا."
+msgstr[2] ""
+"بإغلاقك لهذه النافذة ستغادر غرفتين. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهما مُجددا."
+msgstr[3] ""
+"بإغلاقك لهذه النافذة ستغادر %u غرف. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهذه الغرف مُجددا."
+msgstr[4] ""
+"بإغلاقك لهذه النافذة ستغادر %u غرفة. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهذه الغرف مُجددا."
+msgstr[5] ""
+"بإغلاقك لهذه النافذة ستغادر %u غرفة. لن تستقبل المزيد من الرسائل حتى تنضم "
+"لهذه الغرف مُجددا."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "هل تريد ترك %s؟"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "لن تستقبل المزيد من الرسائل من غرفة المحادثة هذه حتى تنضم لها مُجددا."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "أغلق النافذة"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "غادر الغرفة"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3235,7 +3375,7 @@ msgstr[3] "%s (%d غير مقروة)"
 msgstr[4] "%s (%d غير مقروة)"
 msgstr[5] "%s (%d غير مقروة)"
 
-#: ../src/empathy-chat-window.c:486
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3246,7 +3386,7 @@ msgstr[3] "%s (و %u أخرى)"
 msgstr[4] "%s (و %u أخرى)"
 msgstr[5] "%s (و %u أخرى)"
 
-#: ../src/empathy-chat-window.c:502
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3257,7 +3397,7 @@ msgstr[3] "%s (%d غير مقروة من الآخرين)"
 msgstr[4] "%s (%d غير مقروة من الآخرين)"
 msgstr[5] "%s (%d غير مقروة من الآخرين)"
 
-#: ../src/empathy-chat-window.c:511
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3268,186 +3408,190 @@ msgstr[3] "%s (%d غير مقروة من الكل)"
 msgstr[4] "%s (%d غير مقروة من الكل)"
 msgstr[5] "%s (%d غير مقروة من الكل)"
 
-#: ../src/empathy-chat-window.c:721
+#: ../src/empathy-chat-window.c:892
+msgid "SMS:"
+msgstr "SMS:"
+
+#: ../src/empathy-chat-window.c:902
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] " "
+msgstr[1] "يرسل رسالة"
+msgstr[2] "يرسل رسالتين"
+msgstr[3] "يرسل %d رسائل"
+msgstr[4] "يرسل %d رسالة"
+msgstr[5] "يرسل %d رسالة"
+
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
-msgstr "يكتب رسالة..."
+msgstr "يكتب رسالة."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "ا_مسح"
+msgid "_Conversation"
+msgstr "م_حادثة"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "ا_تصل"
+msgid "C_lear"
+msgstr "ا_مسح"
 
 #: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "محادثة"
-
-#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "أدرج تعبيرا ر_سوميا"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "الغرفة الم_فضلة"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "ادعُ ال_مشارك…"
+msgid "Notify for All Messages"
+msgstr "أبلغ بكل الرسائل"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "انقل اللِّسان إلى اليسا_ر"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "أظهر _قائمة المتراسلين"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "انقل اللِّسان إلى ال_يمين"
+msgid "Invite _Participant…"
+msgstr "ادعُ شخصا لهذه ال_محادثة…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "أبلغ بكل الرسائل"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:17
-msgid "_Contents"
-msgstr "الم_حتويات"
+msgid "C_ontact"
+msgstr "ا_تصل"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "م_حادثة"
+msgid "_Tabs"
+msgstr "أ_لسنة"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_فصل اللسان"
+msgid "_Previous Tab"
+msgstr "اللسان ال_سابق"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Edit"
-msgstr "ت_حرير"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "اللسان ال_تالي"
 
 #: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "الغرفة الم_فضلة"
+msgid "_Undo Close Tab"
+msgstr "_تراجع عن غلق اللسان"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:21
-msgid "_Help"
-msgstr "م_ساعدة"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "انقل اللِّسان إلى اليسا_ر"
 
 #: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "اللسان ال_تالي"
+msgid "Move Tab _Right"
+msgstr "انقل اللِّسان إلى ال_يمين"
 
 #: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "اللسان ال_سابق"
-
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "أظهر _قائمة المتراسلين"
-
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "أ_لسنة"
-
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_تراجع عن غلق اللسان"
+msgid "_Detach Tab"
+msgstr "_فصل اللسان"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "اسم"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "غرفة"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "اتصل تلقائيا"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "أدر الغرف المفضّلة"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "مكالمة صوت وصورة واردة"
 
-#: ../src/empathy-event-manager.c:507
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "يتصل %s بك صوت وصورة، هل ترغب بالإجابة؟"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "يتصل %s بك، هل ترغب بالإجابة؟"
 
-#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "مكالمة واردة من %s"
 
-#: ../src/empathy-event-manager.c:540
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "_ارفض"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
-msgstr "_أجب"
+msgstr "أ_جب"
+
+#: ../src/empathy-event-manager.c:560
+msgid "_Answer with video"
+msgstr "إ_جابة مع فيديو"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "مكالمة صوت وصورة واردة من %s"
 
-#: ../src/empathy-event-manager.c:737
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "دعوة غرفة"
 
-#: ../src/empathy-event-manager.c:739
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
 msgstr "دعوة للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:746
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "يدعوك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:754
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "ا_رفض"
 
-#: ../src/empathy-event-manager.c:759
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:800
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "ان_ضم"
 
-#: ../src/empathy-event-manager.c:786
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "دعاك %s للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:792
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "لقد دُعيت للانضمام إلى %s"
 
-#: ../src/empathy-event-manager.c:843
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "ملف وارد من %s"
 
-#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:370
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "كلمة السر مطلوبة"
 
-#: ../src/empathy-event-manager.c:1069
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "‏%s يطلب السماح بأن يعرف بتواجدك على الخط"
 
-#: ../src/empathy-event-manager.c:1073
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
@@ -3460,13 +3604,13 @@ msgstr ""
 #: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
-msgstr "%u:%02u.%02u"
+msgstr "%u:%02u:%02u"
 
 #. Translators: time left, when is is less than one hour
 #: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
-msgstr "%02u.%02u"
+msgstr "%02u:%02u"
 
 #: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
@@ -3533,7 +3677,7 @@ msgstr "\"%s\" أُرسل إلى %s"
 msgid "File transfer completed"
 msgstr "تم نقل الملف"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "بانتظار رد الشخص الآخر"
 
@@ -3547,15 +3691,15 @@ msgstr "يتحقق من سالة \"%s\""
 msgid "Hashing \"%s\""
 msgstr "يُلبّد \"%s\""
 
-#: ../src/empathy-ft-manager.c:1016
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
-msgstr "٪"
+msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1028
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ملف"
 
-#: ../src/empathy-ft-manager.c:1050
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "الباقي"
 
@@ -3567,165 +3711,206 @@ msgstr "نقل الملفات"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "أزل الملفات المرسلة الكاملة والملغية والتي فشلت من القائمة"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "ا_ستورد"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
 "لم يُعثر على أي حساب لاستيراده. إمبثي يدعم استيراد الحسابات من بدجن فقط."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "استورد الحسابات"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "استورد"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "بروتوكول"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "المصدر"
 
-#: ../src/empathy-main-window.c:387
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "أدخل كلمة السر"
 
-#: ../src/empathy-main-window.c:393
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "افصل"
 
-#: ../src/empathy-main-window.c:533
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "تحتاج لإعداد حساب لرؤية المتراسلين هنا."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "لا نتائج"
 
-#: ../src/empathy-main-window.c:688
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "عذرًا، الحسابات %s لايمكن استخدامها حتى ترقية برنامج %s."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "تحديث البرنامج..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "نظّف"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "أعد الاتصال"
 
-#: ../src/empathy-main-window.c:694
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "حرِر الحساب"
 
-#: ../src/empathy-main-window.c:700
-msgid "Close"
-msgstr "نظيف"
+#. 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 "اشحن %s (%s) ..."
 
-#: ../src/empathy-main-window.c:1418
-msgid "Contact"
-msgstr "متراسل"
+#: ../src/empathy-roster-window.c:1156
+msgid "Top up account credit"
+msgstr "اشحن رصيد الحساب"
 
-#: ../src/empathy-main-window.c:1765
-msgid "Contact List"
-msgstr "قائمة المتراسلين"
+#. top up button
+#: ../src/empathy-roster-window.c:1228
+msgid "Top Up..."
+msgstr "اشحن..."
 
-#: ../src/empathy-main-window.c:1881
-msgid "Show and edit accounts"
-msgstr "اعرض و _حرّر الحسابات"
+#: ../src/empathy-roster-window.c:1952
+msgid "Contact"
+msgstr "متراسل"
 
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "المتراسلين على ال_خريطة"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "تحتاج لتفعيل أحد حساباتك لرؤية المراسلين هنا."
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Find in Contact _List"
-msgstr "ابح_ث في قائمة المتراسلين"
+#. 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 "تحتاج لتفعيل %s لرؤية المتراسلين هنا."
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Join _Favorites"
-msgstr "ان_ضِم إلى المفضلين"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "قائمة المتراسلين"
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Manage Favorites"
-msgstr "أدر المفضلة"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "إعدادات الحساب"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "N_ormal Size"
-msgstr "حجم _عادي"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_محادثة جديدة…"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "مكالمة _جديدة…"
 
-#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr "حجم عادي مع أي_قونات"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "اب_حث عن المتراسلين…"
 
-#: ../src/empathy-main-window.ui.h:8
-msgid "P_references"
-msgstr "الت_فضيلات"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_نقل الملفات"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "المتراسلين _غير المتَّصلين"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "أظهر البروتو_كولات"
 
-#: ../src/empathy-main-window.ui.h:10
-msgid "Sort by _Name"
-msgstr "رتب حسب الا_سم"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "رصيد الحساب"
 
-#: ../src/empathy-main-window.ui.h:11
-msgid "Sort by _Status"
-msgstr "رتّب حسب ال_حالة"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "المتراسلين على ال_خريطة"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ال_حسابات"
 
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "المتراسلين الم_منوعين"
 
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Compact Size"
-msgstr "حجم _مضغوط"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "الت_فضيلات"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_Debug"
-msgstr "_نقّح"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ابح_ث في قائمة المتراسلين"
 
-#: ../src/empathy-main-window.ui.h:20
-msgid "_File Transfers"
-msgstr "_نقل الملفات"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "رتب حسب الا_سم"
 
-#: ../src/empathy-main-window.ui.h:22
-msgid "_Join…"
-msgstr "ان_ضم…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "رتّب حسب ال_حالة"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_محادثة جديدة…"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "حجم عادي مع أي_قونات"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Offline Contacts"
-msgstr "المتراسلين _غير المتَّصلين"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "حجم _عادي"
 
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Personal Information"
-msgstr "الم_علومات الشخصية"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "حجم _مضغوط"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_غرفة"
 
-#: ../src/empathy-main-window.ui.h:28
-msgid "_Search for Contacts…"
-msgstr "اب_حث عن المتراسلين…"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "ان_ضم…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "ان_ضِم إلى المفضلين"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "أدر المفضلة"
+
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "غرفة دردشة"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "الأعضاء"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:560
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -3738,22 +3923,27 @@ msgstr ""
 "مطلوب كلمة سر: %s\n"
 "الأعضاء: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:562
-#: ../src/empathy-new-chatroom-dialog.c:563
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "نعم"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "لا"
 
-#: ../src/empathy-new-chatroom-dialog.c:591
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "تعذّر بدء سرد الغرف"
 
-#: ../src/empathy-new-chatroom-dialog.c:601
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "تعذّر إيقاف سرد الغرف"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "تعذّر تحميل قائمة الغرف"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "انضم للغرفة"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -3763,6 +3953,10 @@ msgstr ""
 "الائحة."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ال_غُرفة:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -3770,341 +3964,943 @@ msgstr ""
 "أدخِل الخادوم الذي يستضيف الغرفة، أو اتركه فارغا إذا كانت الغرفة على خادوم "
 "الحساب الحالي"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "انضم للغرفة"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "تعذّر تحميل قائمة الغرف"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "قائمة الغرف"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ال_غُرفة:"
-
-#: ../src/empathy-preferences.c:139
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "تم إستلام الرسالة"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "أرسلت الرسالة"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "محادثة جديدة"
 
-#: ../src/empathy-preferences.c:142
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "اتصل المتراسل"
 
-#: ../src/empathy-preferences.c:143
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "انفصل المتراسل"
 
-#: ../src/empathy-preferences.c:144
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "الحساب متصل"
 
-#: ../src/empathy-preferences.c:145
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "الحساب غير متصل"
 
-#: ../src/empathy-preferences.c:446
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "اللغة"
 
-#: ../src/empathy-preferences.c:875
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "أحمد"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "محمد"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "السلام عليكم"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "كيف حالك أخي محمد"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "هل جرّبت نسخة إمبثي الجديدة؟"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "أم لا زلت تعمل على النسخة القديمة؟"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "نعم، لقد جربتها وهي رائعة"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "قُطع الاتصال بأحمد"
+
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "التفضيلات"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "المظهر"
+msgid "Show _smileys as images"
+msgstr "أظهر الابت_سامات كرسوم"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "السلوك"
+msgid "Show contact _list in rooms"
+msgstr "أظهر _قائمة المتراسلين في الغرف"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "_سمة المحادثة:"
+msgid "Appearance"
+msgstr "المظهر"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "عطل التنبيهات عندما أكون بعيدا أو مشغولا"
+msgid "Start chats in:"
+msgstr "ابدأ المُحادثات في:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "عطل الأصوات عندما أكون بعيدا أو مشغولا"
+msgid "new ta_bs"
+msgstr "أ_لسنة جديدة"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Display incoming events in the notification area"
-msgstr "اعرض الأحداث القادمة في منطقة التنبيهات"
+msgid "new _windows"
+msgstr "_نوافذ جديدة"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "فعّل التنبيهات عندما يصبح المتراسل على الخط"
+msgid "Display incoming events in the notification area"
+msgstr "اعرض الأحداث الواردة في منطقة التنبيهات"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "فعّل التنبيهات عندما يصبح المتراسل غير متصل"
+msgid "_Automatically connect on startup"
+msgstr "_اتّصل آليا عند بدء التَّشغيل"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "فعّل التنبيهات عندما تكون المحادثة غير مركز عليها"
+msgid "Log conversations"
+msgstr "سجّل المحادثات"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "فعل تدقيق التهجئة للغات:"
+msgid "Behavior"
+msgstr "السلوك"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "عامّ"
 
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "_فعّل بالون التنبيهات"
+
 #: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "مصدر المكان:"
+msgid "Disable notifications when _away or busy"
+msgstr "عطل التنبيهات عندما أكون _بعيدا أو مشغولا"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Log conversations"
-msgstr "سجّل المحادثات"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "فعّل التنبيهات عندما تكون الم_حادثة غير مركز عليها"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Notifications"
-msgstr "التنبيهات"
+msgid "Enable notifications when a contact comes online"
+msgstr "فعّل التنبيهات عندما يصبح المتراسل على الخط"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Play sound for events"
-msgstr "شغل صوت للأحداث"
+msgid "Enable notifications when a contact goes offline"
+msgstr "فعّل التنبيهات عندما يصبح المتراسل غير متصل"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "الخصوصية"
+msgid "Notifications"
+msgstr "التنبيهات"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"دقة المكان المنخفضة تعني أن لا شيء أدق من المدينة والمحافظة والدولة سيُنشر.  "
-"إحداثيات نظام تحديد المواقع ستكون بدقة خانة عشرية واحدة. "
+msgid "_Enable sound notifications"
+msgstr "_فعّل التنبيهات الصوتية"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "أظهر الابت_سامات كرسوم"
+msgid "Disable sounds when _away or busy"
+msgstr "عطل الأ_صوات عندما أكون بعيدا أو مشغولا"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "أظهر _قائمة المتراسلين في الغرف"
+msgid "Play sound for events"
+msgstr "شغل صوت للأحداث"
 
 #: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "الأصوات"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "التدقيق الإملائي"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "استخدم إلغاء ال_صدى لتحسين جودة المكالمة"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Themes"
-msgstr "السِمات"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "_Automatically connect on startup"
-msgstr "_اتّصل آليا عند بدء التَّشغيل"
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"يساعد إلغاء الصدى على جعل صوتك أوضح للشخص الآخر، ولكنه قد يسبب مشاكل على بعض "
+"الحواسب. إذا كنت تسمع أنت أو الشخص الآخر ضوضاء غريبة أو جلبة خلال المكالمات، "
+"حاول إيقاف إلغاء الصدى وقم بإعادة تشغيل المكالمة."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "_Cellphone"
-msgstr "_هاتف محمول"
+msgid "_Publish location to my contacts"
+msgstr "ا_نشر مكاني إلى المتراسلين"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "_Enable bubble notifications"
-msgstr "_فعّل بالون التنبيهات"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "_Enable sound notifications"
-msgstr "_فعّل التنبيهات الصوتية"
+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 ""
+"دقة المكان المنخفضة تعني أن لا شيء أدق من المدينة والمحافظة والدولة سيُنشر. "
+"إحداثيات نظام تحديد المواقع ستكون بدقة خانة عشرية واحدة."
 
+#. 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 "_GPS"
-msgstr "_نظام المواقع الجغرافي"
+msgid "_Reduce location accuracy"
+msgstr "_قلل دقة المكان"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Network (IP, Wi-Fi)"
-msgstr "ال_شبكة (رقم الإنترنت، لا سلكي)"
+msgid "Privacy"
+msgstr "الخصوصية"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Open new chats in separate windows"
-msgstr "ا_فتح غرف الدردشة الجديدة في نوافذ منفصلة"
+msgid "_GPS"
+msgstr "_نظام المواقع الجغرافي"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Publish location to my contacts"
-msgstr "ا_نشر مكاني إلى المتراسلين"
+msgid "_Cellphone"
+msgstr "_هاتف محمول"
+
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ال_شبكة (رقم الإنترنت، لا سلكي)"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Reduce location accuracy"
-msgstr "_قلل دقة المكان"
+msgid "Location sources:"
+msgstr "مصدر المكان:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "قائمة اللغات الموجودة هنا لا تعكس إلا اللغات التي يوجد لها قاموس مركب."
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "فعل تدقيق التهجئة للغات:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "التدقيق الإملائي"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_سمة المحادثة:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "الشكل:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "السِمات"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "الحالة"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "أ_نه"
 
-#: ../src/empathy-map-view.c:442
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "مشهد خريطة المتراسَلين"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "احفظ"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "البيانات كبيرة جدًا بالنسبة للصق واحد. رجاءً احفظ السجلات إلى ملف."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "نافذة التنقيح"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1970
+#, fuzzy
+msgid "Send to pastebin"
+msgstr "أرسل إلى سلّة اللصق"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "ألبِث"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
-msgstr "المستوى"
+msgstr "المستوى "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "تنقيح"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "معلومات"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "رسالة"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "حرِج"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "خطأ"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "الوقت"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "النطاق"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "الفئة"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "المستوى"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "مدير الاتصالات المختار لا يدعم امتداد التنقيح عن بعد."
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
-msgstr "ادعُ المشارك"
+msgstr "دعوة شخص لهذه المحادثة"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "اختر متراسلا لدعوته إلى المحادثة:"
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "ادعُ"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "لا تعرض أي حوارات، قم بالعمل (مثلا: الاستيراد) ثم أغلق"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "لا تعرض أي حوارات إلا في حال وجود حسابات \"أشخاص قريبون\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "حدد الحساب المعطى (مثلا gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- حسابات إمبثي"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "حسابات إمبثي"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "أظهر خدمة محددة"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- منقّح إمبثي"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "منقّح إمبثي"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- مرسال الدردشة إمبثي"
 
-#: ../src/empathy-notifications-approver.c:184
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "استجب"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "ارفض"
 
-#: ../src/empathy-notifications-approver.c:194
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "أجب"
 
-#: ../src/empathy-notifications-approver.c:201
-#: ../src/empathy-notifications-approver.c:211
+#: ../src/empathy-notifications-approver.c:206
+msgid "Answer with video"
+msgstr "أجابة مع فيديو"
+
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "لا تُجب"
 
-#: ../src/empathy-notifications-approver.c:205
-#: ../src/empathy-notifications-approver.c:216
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "اقبل"
 
-#: ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "مكالمة فائتة مِن %s"
+#. 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:239
+msgid "Provide"
+msgstr "زوّد"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "حاول %s الاتصال بك قبل قليل لكنك كنت مشغولا بمكالمة أخرى."
 
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
+msgid "i"
+msgstr "i"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
+#, c-format
+msgid "Call with %s"
+msgstr "اتصل باستخدام %s"
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "رقم الإنترنت كما يراه الجهاز"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "رقم الإنترنت كما يراه خادوم على الإنترنت"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "رقم الإنترنت للند كما يُرى على الجانب الآخر"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "رقم الإنترنت لخادوم تقوية"
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "رقم الإنترنت لمجموعة توصيل متعدد"
+
+#: ../src/empathy-call-window.c:2883
+msgid "On hold"
+msgstr "قيد الانتظار"
+
+#: ../src/empathy-call-window.c:2886
+msgid "Mute"
+msgstr "أكتم"
+
+#: ../src/empathy-call-window.c:2888
+msgid "Duration"
+msgstr "المدة"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2891
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02d"
+
+#: ../src/empathy-call-window.c:2987
+msgid "Technical Details"
+msgstr "التفاصيل التقنية"
+
+#: ../src/empathy-call-window.c:3026
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "برمجية %s لا تفهم أيا من أنساق الصوت المدعومة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3031
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "برمجية %s لا تفهم أيا من أنساق الفيديو المدعومة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3037
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"تعذّر إنشاء اتصال مع %s. قد يكون أحدكما في شبكة لا تسمح بالاتصالات المباشرة."
+
+#: ../src/empathy-call-window.c:3043
+msgid "There was a failure on the network"
+msgstr "حدث عطل في الشبكة"
+
+#: ../src/empathy-call-window.c:3047
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "أنساق الصوت المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "أنساق الفديو المطلوبة لإجراء هذه المكالمة ليست مثبتة على حاسوبك"
+
+#: ../src/empathy-call-window.c:3062
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"حدث أمر غير متوقع في مكون تليباثي. من فضلك <a href=\"%s\">أبلغ عن هذه العلة</"
+"a> وأرفق السجل المجمع في نافذة 'نقح' من قائمة 'مساعدة'."
+
+#: ../src/empathy-call-window.c:3071
+msgid "There was a failure in the call engine"
+msgstr "حدث عطل في محرك الاتصالات"
+
+#: ../src/empathy-call-window.c:3074
+msgid "The end of the stream was reached"
+msgstr "وُصِل إلى نهاية الدفق"
+
+#: ../src/empathy-call-window.c:3114
+msgid "Can't establish audio stream"
+msgstr "تعذر بناء دفق الصوت"
+
+#: ../src/empathy-call-window.c:3124
+msgid "Can't establish video stream"
+msgstr "تعذر بناء دفق الفديو"
+
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "رصيدك الحالي هو %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "عذرًا، لا تملك رصيدًا كافيًا لهذه المكالمة."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "شحن"
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- المرسال إمبثي"
+
+#: ../src/empathy-call.c:223
+msgid "Empathy Audio/Video Client"
+msgstr "المرسال إمبثي"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_طابِق حالة الأحرف"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "ما نوع حساب الدردشة الذي تمتلكه؟"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "إضافة حساب جديد"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "مع أصدقاء"
+
+#: ../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."
+msgstr ""
+"يستطيع إمبثي أن يكتشف تلقائيا ويفتح محادثة مع الأشخاص المتصلين معك على نفس "
+"الشبكة. إذا أردت استخدام هذه الخاصية فتأكد من أن التفاصيل أدناه صحيحة."
+
+#: ../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 ""
+"يمكنك تغيير هذه التفاصيل لاحقًا أو تعطيل هذه الميزات من <span style=\"italic"
+"\">تحرير ← الحسابات</span> في قائمة المتراسلين."
+
+#~ msgid "Contrast"
+#~ msgstr "التباين"
+
+#~ msgid "Brightness"
+#~ msgstr "السطوع"
+
+#~ msgid "Gamma"
+#~ msgstr "جاما"
+
+#~ msgid "Volume"
+#~ msgstr "الحجم"
+
+#~ msgid "_Sidebar"
+#~ msgstr "الشريط ال_جانبي"
+
+#~ msgid "Audio input"
+#~ msgstr "مدخلات الصوت"
+
+#~ msgid "Video input"
+#~ msgstr "مدخلات الفيديو"
+
+#~ msgid "Dialpad"
+#~ msgstr "لوحة الأرقام"
+
+#~ msgid "Details"
+#~ msgstr "التفاصيل"
+
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "مجهول"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "متَصل — %d:%02dm"
+
+#~ msgid "Redial"
+#~ msgstr "أعِد الاتصال"
+
+#~ msgid "V_ideo"
+#~ msgstr "_فديو"
+
+#~ msgid "Video Off"
+#~ msgstr "عطّل الفديو"
+
+#~ msgid "Video Preview"
+#~ msgstr "معاينة الفيديو"
+
+#~ msgid "Video On"
+#~ msgstr "فعّل الفديو"
+
+#~ msgid "Call the contact again"
+#~ msgstr "اتصل بالمتراسل ثانيةً"
+
+#~ msgid "Camera Off"
+#~ msgstr "عطل الكاميرا"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "عطل الكاميرا وتوقف عن إرسال الفديو"
+
+#~ msgid "Preview"
+#~ msgstr "معاينة"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "فعّل الكاميرا ولا ترسل فديو"
+
+#~ msgid "Camera On"
+#~ msgstr "فعّل الكاميرا"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "فعّل الكاميرا وأرسل فديو"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "المتراسلين المترابطين"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "حدد متراسلا لربطه"
+
+#~ msgid "New contact preview"
+#~ msgstr "معاينة متراسل جديد"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "المتراسلين المحددين في القائمة على اليمين سيربطون إلى بعضهم البعض."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "ا_ربط المتراسلين…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "اربط المتراسلين"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "ا_فصل…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "افصل المتراسل المرتبط المعروض إلى متراسلين منفصلين."
+
+#~ msgid "_Link"
+#~ msgstr "ار_بط"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "أأفصل المتراسلين المرتبطين '%s'؟"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "أمتأكد من رغبتك في فصل هؤلاء المتراسلين المرتبطين؟ هذا سيفصل المتراسلين "
+#~ "المرتبطين إلى كل على حدة."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "ا_فصل"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "حدث خطأ أثناء استيراد الحسابات."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "حدث خطأ أثناء تحليل تفاصيل الحساب."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "حدث خطأ أثناء إنشاء الحساب."
+
+#~ msgid "There was an error."
+#~ msgstr "حدث خطأ."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "رسالة الخطأ: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "يمكنك إما العودة للخلف ومحاولة إدخال تفاصيل الحساب مرة ثانية، أو إغلاق "
+#~ "هذا المساعد وإضافة الحساب لاحقا من قائمة تحرير."
+
+#~ msgid "An error occurred"
+#~ msgstr "حدث خطأ"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "ألديك حساب دردشة آخر تريد إعداده؟"
+
+#~ msgid "Enter your account details"
+#~ msgstr "أدخل تفاصيل الحساب"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "ما نوع حساب الدردشة الذي تريد إنشاءه؟"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "هل تريد إنشاء حسابات دردشة أخرى؟"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "أدخل تفاصيل الحساب الجديد"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "مع إمبثي تستطيع الدردشة مع أصدقائك وزملائك الذين يستخدمون جوجل توك، أو "
+#~ "AIM، أو Windows Live والكثير من برامج الدردشة الأخرى. وباستخدام ميكروفون "
+#~ "وكاميرا تستطيع إجراء محادثات بالصوت والصورة."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "هل لديك حساب كنت تستخدمه مع برنامج دردشة آخر؟"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "نعم، استورد معلومات حسابي من "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "نعم، سأُدخل معلومات حسابي الآن"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "لا، أريد حسابا جديدا"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "لا، حاليا أريد رؤية الأشخاص المتصلين قريبا مني فقط"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "اختر الحسابات التي تريد استيرادها:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "لا، يكفي هذا الآن"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "تحرير⇐الحسابات"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "لا أريد _تفعيل هذه الخاصية الآن"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "لن تستطيع الدردشة مع الأشخاص المتصلين معك على نفس الشبكة لأن telepathy-"
+#~ "salut غير مثبت. إذا أردت تفعيل هذه الخاصية فمن فضلك ثبّت حزمة telepathy-"
+#~ "salut ثم أنشئ حساب 'أشخاص قريبون' من حوار الحسابات"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "مساعد حسابات التراسل والصوت عبر الشبكة"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "مرحبا مع إمبثي"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "استورد حساباتك الموجودة"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "من فضلك أدخل بيانات الشخصية"
+
+#~ msgid "Protocol:"
+#~ msgstr "البروتوكول:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "أظهر مساعد الحساب"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "نوع المقبس غير مدعوم"
+
+#~| msgid "Launch My Web Accounts"
+#~ msgid "My Web Accounts"
+#~ msgstr "حسابات الوب خاصتي"
+
+#~| msgid "The account %s is edited via My Web Accounts."
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "الحساب %s حُرِرَ من خلال %s"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "لا يمكن تحرير الحساب %s في إمبثي."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "شغّل \"حسابات الوب\""
+
+#~| msgid "_Edit"
+#~ msgid "Edit %s"
+#~ msgstr "تحرير %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "أ_لغِ"
+
+#~ msgid "Personal Information"
+#~ msgstr "المعلومات الشخصية"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_حرّر"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "أنت على وشك إنشاء حساب جديد، والذي سيتجاهل تعديلاتك.\n"
+#~ "أمُتأكد أنك ترغب في إتمام العملية؟"
+
+#~ msgid "_Personal Information"
+#~ msgstr "الم_علومات الشخصية"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "ا_فتح غرف الدردشة الجديدة في نوافذ منفصلة"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "رحّل إمبثي سجلات butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "فيما إذا كان إمبثي رحّل سجلات butterfly."
+
+#~ msgid "All"
+#~ msgstr "الكل"
+
+#~ msgid "_Enabled"
+#~ msgstr "_مفعّل"
+
+#~ msgid "Ungrouped"
+#~ msgstr "غير مجمّع"
+
+#~ msgid "Favorite People"
+#~ msgstr "الأشخاص المفضّلين"
+
+#~ msgid "Select a contact"
+#~ msgstr "حدد متراسلا"
+
+#~ msgid "Date"
+#~ msgstr "التاريخ"
+
+#~ msgid "Conversations"
+#~ msgstr "محادثات"
+
+#~ msgid "Find Next"
+#~ msgstr "ابحث عن التالي"
+
+#~ msgid "Find Previous"
+#~ msgstr "ابحث عن السابق"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "المحادثات السابقة"
+
+#~ msgid "_For:"
+#~ msgstr "_عن:"
+
+#~ msgid "Contact ID:"
+#~ msgstr "معرّف المتراسل:"
+
+#~ msgid "C_hat"
+#~ msgstr "ا_بدأ محادثة"
+
+#~ msgid "C_all"
+#~ msgstr "ا_تصل"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "حدد تواجدك وحالتك الحالية"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "حرر الرسالة المخصّصة"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "احفظ رسالة _حالة جديدة"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "رسائل الحالة المحفوظة"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "المُتراسل المحدد لا يستطيع استقبال ملفات."
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "اعرض و _حرّر الحسابات"
+
 #~ msgid "Context"
 #~ msgstr "السياق"
diff --git a/po/as.po b/po/as.po
index e0b71801b..45686baed 100644
--- a/po/as.po
+++ b/po/as.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2009 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 #
-# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011.
+# Nilamdyuti Goswami <ngoswami@redhat.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy gnome-2-28\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-15 19:40+0530\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-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 18:14+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: as_IN <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,670 +19,679 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Google Talk, Facebook, MSN আৰু বহুতো অন্য চেট সেৱাসমূহত চেট কৰক"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM গ্ৰাহক"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy ইন্টাৰনেট বাৰ্তাকৰণ"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM গ্ৰাহক"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Google Talk, Facebook, MSN আৰু বহুতো অন্য চেট সেৱাসমূহত চেট কৰক"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "বাৰ্তা আৰু VoIP একাওন্টসমূহ"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "বাৰ্তা আৰু VoIP একাওন্টসমূহ ব্যৱস্থাপনা কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "নতুন চেটৰ বাবে সদায়ে পৃথক চেট উইন্ডো খোলা হ'ব।"
+msgid "Connection managers should be used"
+msgstr "সংযোগ ব্যৱস্থাপকসমূহ ব্যৱহাৰ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "কল ভলিউম"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"স্বচালিতভাৱে বিচ্ছিন্ন/পুনৰসংযোগ কৰিবলে সংযোগ ব্যৱস্থাপকসমূহক ব্যৱহাৰ কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "কল ভলিউম, এটা শতাংশ হিচাপে।"
+msgid "Empathy should auto-connect on startup"
+msgstr "আৰম্ভ সময়ত Empathy দ্বাৰা স্বচালিতভাৱে সংযোগ স্থাপন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "কেমেৰা ডিভাইচ"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy -এ আৰম্ভণিত আপোনাৰ একাওন্টসমূহত স্বচালিতভাৱে লগিন কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "কেমেৰা অৱস্থান"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy অলস অৱস্থাত স্বচালিতভাৱে-আতৰত হব লাগিব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"দলৰ সৈতে চেট কৰা সময়ত উপনাম সম্পূৰ্ণ (টেব) ব্যৱহাৰ কৰোতে উপনামৰ পিছত যোগ কৰিব "
-"লগিয়া আখৰ।"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ব্যৱহাৰকাৰী অলস থাকিলে Empathy -এ স্বচালিতভাৱে আতৰ অৱস্থাত যাব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "চেট উইন্ডোৰ থীম"
+msgid "Empathy default download folder"
+msgstr "Empathy ৰ অবিকল্পিত ডাউনল'ড ফোল্ডাৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "চেট উইন্ডো থীম অপৰ"
+msgid "The default folder to save file transfers in."
+msgstr "স্থানান্তৰ কৰা সামগ্ৰী সংৰক্ষণৰ বাবে চিহ্নিত ফোল্ডাৰ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"ব্যৱহাৰ কৰিবলে বানান নিৰীক্ষক ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, nl\")।"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "স্থিৰ পৰিষ্কাৰ কাৰ্য্যসমূহ চলোৱা হবনে নীৰিক্ষণ কৰিবলে ব্যৱহৃত জাদু সংখ্যা"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "পৰিচিত ব্যক্তিৰ তালিকা সংকোচিত কৰক"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c এই নম্বৰক পৰিষ্কাৰ কৰা কাৰ্য্যসমূহ এক্সিকিউট কৰা হবনে "
+"নীৰিক্ষণ কৰিবলে ব্যৱহাৰ কৰে। ব্যৱহাৰকাৰীসমূহে এই চাবিক হস্তচালিতভাৱে সলনি কৰিব "
+"নালাগে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "সংযোগ ব্যৱস্থাপকসমূহ ব্যৱহাৰ কৰক"
+msgid "Show offline contacts"
+msgstr "অফ-লাইন অৱস্থাত থকা পৰিচিত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "পৰিচয় তালিকা সজোৱা নিয়ম"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "পৰিচয় তালিকাত অফলাইন থকা পৰিচয়সমূহ দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"ভিডিঅ' কলসমূহত ব্যৱহাৰ কৰিব লগিয়া অবিকল্পিত কেমেৰা ডিভাইচ, যেনে /dev/video0।"
+msgid "Show avatars"
+msgstr "অৱতাৰৰ ছবি প্ৰদৰ্শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ব্যৱহাৰকাৰীৰ অৱতাৰ আখৰকৰ্তা ছবি নিৰ্ধাৰণৰ বাবে ব্যৱহৃত অবিকল্পিত পঞ্জিকা"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "পৰিচয় তালিকা আৰু চেট উইন্ডোসমূহত পৰিচয়সমূহৰ বাবে অৱতাৰসমূহ দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "আতৰত থাকিলে প'প-আপ সূচনাবাৰ্তা নিষ্ক্ৰিয় কৰক"
+msgid "Show protocols"
+msgstr "প্ৰটোকলসমূহ দেখুৱাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "আতৰত থাকিলে শব্দ নিষ্ক্ৰিয় কৰক"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "পৰিচয় তালিকাৰ পৰিচয়সমূহৰ বাবে প্ৰটোকলসমূহ দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "অৱস্থা স্থানত আগ'ত ঘটনাসমূহ প্ৰদৰ্শন কৰক"
+msgid "Show Balance in contact list"
+msgstr "অৱশিষ্ট পৰিচয় তালিকাত দেখুৱাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"অৱস্থা স্থানত আগ'ত ঘটনাসমূহ প্ৰদৰ্শন কৰক। যদি ভুল, সিহতক ব্যৱহাৰকাৰীলে তৎক্ষনাত "
-"প্ৰেৰণ কৰক।"
+msgid "Whether to show account balances in the contact list."
+msgstr "একাওন্ট অৱশিষ্টসমূহ পৰিচয় তালিকাত দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "প্ৰতিধ্বনি বাতিল সমৰ্থন"
+msgid "Compact contact list"
+msgstr "পৰিচিত ব্যক্তিৰ তালিকা সংকোচিত কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy দ্বাৰা ব্যৱহাৰকাৰীৰ ভৌগলিক অৱস্থান প্ৰকাশ কৰা সম্ভৱ হ'ব"
+msgid "Whether to show the contact list in compact mode."
+msgstr "পৰিচয় তালিকাক সংকোচিত অৱস্থাত দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "GPS সহযোগে Empathy দ্বাৰা ভৌগলিক অৱস্থান গণনা কৰা সম্ভৱ হ'ব"
+msgid "Hide main window"
+msgstr "প্ৰধান উইন্ডো লুকুৱা হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "চেলুলাৰ নেটৱাৰ্ক সহযোগে Empathy দ্বাৰা ভৌগলিক অৱস্থান গণনা কৰা সম্ভৱ হ'ব"
+msgid "Hide the main window."
+msgstr "প্ৰধান উইন্ডো লুকুৱা হ'ব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "নেটৱাৰ্ক সহযোগে Empathy দ্বাৰা ভৌগলিক অৱস্থান গণনা কৰা সম্ভৱ হ'ব"
+msgid "Default directory to select an avatar image from"
+msgstr "ব্যৱহাৰকাৰীৰ অৱতাৰ আখৰকৰ্তা ছবি নিৰ্ধাৰণৰ বাবে ব্যৱহৃত অবিকল্পিত পঞ্জিকা"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy ৰ অবিকল্পিত ডাউনল'ড ফোল্ডাৰ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "সৰ্বশেষ অৱতাৰৰ বাবে ব্যৱহৃত ছবি যি পঞ্জিকাৰ পৰা নিৰ্বাচন কৰা হৈছে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy -এ বাটাৰফ্লাই লগসমূহ প্ৰব্ৰজন কৰিছে"
+msgid "Open new chats in separate windows"
+msgstr "নতুন চেট আৰম্ভ হ'লে পৃথক উইন্ডোত প্ৰদৰ্শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy অলস অৱস্থাত স্বচালিতভাৱে-আতৰত হব লাগিব"
+msgid "Always open a separate chat window for new chats."
+msgstr "নতুন চেটৰ বাবে সদায়ে পৃথক চেট উইন্ডো খোলা হ'ব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "আৰম্ভ সময়ত Empathy দ্বাৰা স্বচালিতভাৱে সংযোগ স্থাপন কৰক"
+msgid "Display incoming events in the status area"
+msgstr "অৱস্থা স্থানত আগ'ত ঘটনাসমূহ প্ৰদৰ্শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy দ্বাৰা ভৌগলিক অৱস্থানৰ নিৰ্ভুলতাৰ পৰিমাণ হ্ৰাস"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"অৱস্থা স্থানত আগ'ত ঘটনাসমূহ প্ৰদৰ্শন কৰক। যদি ভুল, সিহতক ব্যৱহাৰকাৰীলে তৎক্ষনাত "
+"প্ৰেৰণ কৰক।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "চেটৰ উইন্ডোৰ আইকন ৰূপে Empathy দ্বাৰা পৰিচয়ৰ অৱতাৰ প্ৰয়োগ কৰক"
+msgid "The position for the chat window side pane"
+msgstr "চেট উইন্ডো কাষ পেইনৰ অৱস্থান"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit উন্নয়নক সঁজুলিৰ ব্যৱহাৰ সামৰ্থবান কৰক"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "চেট উইন্ডো কাষ পেইনৰ সংৰক্ষিত অৱস্থান (পিক্সেলসমূহত)।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "নতুন বাৰ্তাৰ বাবে প'প-আপ সূচনাবাৰ্তা সামৰ্থবান কৰক"
+msgid "Show contact groups"
+msgstr "পৰিচয় দলসমূহ দেখুৱাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "বানান পৰীক্ষণ সামৰ্থবান কৰক"
+msgid "Whether to show groups in the contact list."
+msgstr "পৰিচয় তালিকাত দলসমূহ দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "প্ৰধান উইন্ডো লুকুৱা হ'ব"
+msgid "Contact list sort criterion"
+msgstr "পৰিচয় তালিকা সজোৱা নিয়ম"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "প্ৰধান উইন্ডো লুকুৱা হ'ব।"
+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 ""
+"পৰিচয় তালিকা সজাওতে কোনটো নিয়ম ব্যৱহাৰ কৰা হব। অবিকল্পিত হল পৰিচয়ৰ অৱস্থাৰে "
+"সজোৱা \"state\" মানৰ সৈতে। \"name\" ৰ মানে পৰিচয় তালিকাক নামৰে সজাব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "নাম সম্পূৰ্ণকৰণৰ আখৰ"
+msgid "Use notification sounds"
+msgstr "সূচনামূলক শব্দ ব্যৱহাৰ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "নতুন চেট আৰম্ভ হ'লে পৃথক উইন্ডোত প্ৰদৰ্শন কৰক"
+msgid "Whether to play a sound to notify of events."
+msgstr "ঘটনাসমূহ অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "ব্যৱহাৰ কৰিবলে Adium থীমৰ পথ"
+msgid "Disable sounds when away"
+msgstr "আতৰত থাকিলে শব্দ নিষ্ক্ৰিয় কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"যদি চেটৰ বাবে ব্যৱহাৰ কৰা থীম Adium হয় তেন্তে ব্যৱহাৰ কৰিব লগিয়া Adium থীমৰ পথ।"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "আতৰত বা ব্যস্ত থাকোতে শব্দ অধিসূচনাসমূহ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "নতুন বাৰ্তা প্ৰাপ্ত হ'লে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "নতুন চেটৰ বাবে শব্দ বজাওক"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "আগ'ত বাৰ্তাসমূহৰ বিষয়ে অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "নতুন বাৰ্তা পঠিওৱা হ'লে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "পৰিচিত ব্যক্তি লগিন কৰিলে শব্দ বজাওক"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "বাহিৰগামি বাৰ্তাসমূহৰ অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "পৰিচিত ব্যক্তি প্ৰস্থান কৰিলে শব্দ বজাওক"
+msgid "Play a sound for new conversations"
+msgstr "নতুন চেটৰ বাবে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "নিজেই লগিন কৰিলে শব্দ বজাওক"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "নতুন কথোপকথনসমূহৰ বিষয়ে অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "নিজেই প্ৰস্থান কৰিলে শব্দ বজাওক"
+msgid "Play a sound when a contact logs in"
+msgstr "পৰিচিত ব্যক্তি লগিন কৰিলে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "অধিসূচনাসমূহ পপ আপ কৰিব যদি চেট মনোনিবেষিত নহয়"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "নেটৱাৰ্কত লগিন কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "যেতিয়া এজন পৰিচয় লগিন কৰে অধিসূচনাসমূহ পপ-আপ কৰিব "
+msgid "Play a sound when a contact logs out"
+msgstr "পৰিচিত ব্যক্তি প্ৰস্থান কৰিলে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "যেতিয়া এজন পৰিচয় লগআউট কৰে অধিসূচনাসমূহ পপ আপ কৰিব"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "নেটৱাৰ্কৰ পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "এটা কলৰ সময়ত কেমেৰা পূৰ্বদৰ্শন যি অৱস্থাত থাকিব লাগিব।"
+msgid "Play a sound when we log in"
+msgstr "নিজেই লগিন কৰিলে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "অৱশিষ্ট পৰিচয় তালিকাত দেখুৱাওক"
+msgid "Whether to play a sound when logging into a network."
+msgstr "এটা নেটৱাৰ্কত লগিন কৰোতে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "অৱতাৰৰ ছবি প্ৰদৰ্শন কৰক"
+msgid "Play a sound when we log out"
+msgstr "নিজেই প্ৰস্থান কৰিলে শব্দ বজাওক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "ৰুমত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰক"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "এটা নেটৱাৰ্কৰ পৰা লগ আউট কৰোতে এটা শব্দ বজোৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "প্ৰধান উইন্ডো বন্ধ কৰাৰ বাবে ইঙ্গিত প্ৰদৰ্শন কৰক"
+msgid "Enable popup notifications for new messages"
+msgstr "নতুন বাৰ্তাৰ বাবে প'প-আপ সূচনাবাৰ্তা সামৰ্থবান কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "অফ-লাইন অৱস্থাত থকা পৰিচিত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰক"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "এটা নতুন বাৰ্তা গ্ৰহণ কৰোতে এটা পপআপ অধিসূচনা দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "প্ৰটোকলসমূহ দেখুৱাওক"
+msgid "Disable popup notifications when away"
+msgstr "আতৰত থাকিলে প'প-আপ সূচনাবাৰ্তা নিষ্ক্ৰিয় কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "ভাষাৰ বাবে বানান পৰীক্ষণ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "আতৰত বা ব্যস্ত থাকোতে পপ আপ অধিসূচনাসমূহ দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "স্থানান্তৰ কৰা সামগ্ৰী সংৰক্ষণৰ বাবে চিহ্নিত ফোল্ডাৰ।"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "অধিসূচনাসমূহ পপ আপ কৰিব যদি চেট মনোনিবেষিত নহয়"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "সৰ্বশেষ অৱতাৰৰ বাবে ব্যৱহৃত ছবি যি পঞ্জিকাৰ পৰা নিৰ্বাচন কৰা হৈছে।"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"এটা নতুন বাৰ্তা গ্ৰহণ কৰোতে চেট ইতিমধ্যে খোলা থাকিলেও, কিন্তু মনোনিবেষিত নহয় এটা "
+"পপআপ অধিসূচনা দেখুৱা হব নে। "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "চেট উইন্ডো কাষ পেইনৰ অৱস্থান"
+msgid "Pop up notifications when a contact logs in"
+msgstr "যেতিয়া এজন পৰিচয় লগিন কৰে অধিসূচনাসমূহ পপ-আপ কৰিব "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "চেট উইন্ডো কাষ পেইনৰ সংৰক্ষিত অৱস্থান (পিক্সেলসমূহত)।"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "এজন পৰিচয় অনলাইন হওতে এটা পপআপ অধিসূচনা দেখাব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "চেটৰ উইন্ডোত কথোপকথন প্ৰদৰ্শনৰ বাবে ব্যৱহৃত থীম।"
+msgid "Pop up notifications when a contact logs out"
+msgstr "যেতিয়া এজন পৰিচয় লগআউট কৰে অধিসূচনাসমূহ পপ আপ কৰিব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "চেট উইন্ডোত কথোপকথনৰ প্ৰদৰ্শনৰ বাবে ব্যৱহৃত থীম অপৰ"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "এজন পৰিচয় অফলাইন হওতে এটা পপআপ অধিসূচনা দেখাব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "গ্ৰাফিকেল স্মাইলি ব্যৱহাৰ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "সূচনামূলক শব্দ ব্যৱহাৰ কৰক"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "স্মাইলিসমূহক কথোপকথনৰ সময়ত গ্ৰাফীয় ছবিসমূহলে পৰিৱৰ্তন কৰা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "চেট ৰুমৰ বাবে থীম প্ৰয়োগ কৰক"
+msgid "Show contact list in rooms"
+msgstr "ৰুমত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy -এ ব্যৱহাৰকাৰীৰ অৱস্থান সিহতৰ পৰিচয়সমূহলে প্ৰকাশ কৰিব পাৰিব নে।"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "চেট ৰুমসমূহত পৰিচয় তালিকা দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy -এ অৱস্থান ঠাওৰ কৰিবলে GPS ব্যৱহাৰ কৰিব পাৰিব নে।"
+msgid "Chat window theme"
+msgstr "চেট উইন্ডোৰ থীম"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy -এ অৱস্থান ঠাওৰ কৰিবলে চেলুলাৰ নেটৱাৰ্ক ব্যৱহাৰ কৰিব পাৰিব নে।"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "চেটৰ উইন্ডোত কথোপকথন প্ৰদৰ্শনৰ বাবে ব্যৱহৃত থীম।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy -এ অৱস্থান ঠাওৰ কৰিবলে নেটৱাৰ্ক ব্যৱহাৰ কৰিব পাৰিব নে।"
+msgid "Chat window theme variant"
+msgstr "চেট উইন্ডো থীম অপৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy -এ বাটাফ্লাই লগসমূহ প্ৰব্ৰজন কৰিছে নে।"
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "চেট উইন্ডোত কথোপকথনৰ প্ৰদৰ্শনৰ বাবে ব্যৱহৃত থীম অপৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy -এ আৰম্ভণিত আপোনাৰ একাওন্টসমূহত স্বচালিতভাৱে লগিন কৰিব লাগে নে।"
+msgid "Path of the Adium theme to use"
+msgstr "ব্যৱহাৰ কৰিবলে Adium থীমৰ পথ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "ব্যৱহাৰকাৰী অলস থাকিলে Empathy -এ স্বচালিতভাৱে আতৰ অৱস্থাত যাব লাগে নে।"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"যদি চেটৰ বাবে ব্যৱহাৰ কৰা থীম Adium হয় তেন্তে ব্যৱহাৰ কৰিব লগিয়া Adium থীমৰ পথ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathy -এ গোপনীয়তা কাৰণসমূহৰ বাবে অৱস্থানৰ সঠিকতা কমাব লাগে নে।"
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit উন্নয়নক সঁজুলিৰ ব্যৱহাৰ সামৰ্থবান কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Empathy -এ পৰিচয়ৰ অৱতাৰক চেট উইন্ডোৰ আইকন হিচাপে ব্যৱহাৰ কৰিব লাগে নে।"
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "WebKit উন্নয়নক সঁজুলি যেনে Web Inspector সামৰ্থবান কৰক নে নাই।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "WebKit উন্নয়নক সঁজুলি যেনে Web Inspector সামৰ্থবান কৰক নে নাই।"
+msgid "Inform other users when you are typing to them"
+msgstr "অন্য ব্যৱহাৰকাৰীসমূহক জনাব যেতিয়া আপুনি সিহতলে লিখি আছে"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"স্বচালিতভাৱে বিচ্ছিন্ন/পুনৰসংযোগ কৰিবলে সংযোগ ব্যৱস্থাপকসমূহক ব্যৱহাৰ কৰিব লাগে নে।"
+"'composing' অথবা 'paused' চেট অৱস্থাসমূহ পঠোৱা হব নে। 'gone' অৱস্থাৰ উপৰত প্ৰভাৱ "
+"নেপেলায়।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"আপুনি নিৰীক্ষণ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শব্দসমূহ নিৰীক্ষণ কৰা হব নে।"
+msgid "Use theme for chat rooms"
+msgstr "চেট ৰুমৰ বাবে থীম প্ৰয়োগ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "স্মাইলিসমূহক কথোপকথনৰ সময়ত গ্ৰাফীয় ছবিসমূহলে পৰিৱৰ্তন কৰা হব নে।"
+msgid "Whether to use the theme for chat rooms."
+msgstr "চেট ৰুমসমূহৰ বাবে থীম ব্যৱহাৰ কৰা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Pulseaudio -ৰ প্ৰতিধ্বনি বাতিল কৰা পৰিস্ৰাৱন সামৰ্থবান কৰিব লাগে নে।"
+msgid "Spell checking languages"
+msgstr "ভাষাৰ বাবে বানান পৰীক্ষণ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "নেটৱাৰ্কত লগিন কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে এটা শব্দ বজোৱা হব নে।"
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"ব্যৱহাৰ কৰিবলে বানান নিৰীক্ষক ভাষাসমূহৰ কমা-পৃথকিত তালিকা (যেনে \"en, fr, nl\")।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "নেটৱাৰ্কৰ পৰা লগ আউট কৰা পৰিচয়সমূহ অধিসূচনা কৰিবলে এটা শব্দ বজোৱা হব নে।"
+msgid "Enable spell checker"
+msgstr "বানান পৰীক্ষণ সামৰ্থবান কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "ঘটনাসমূহ অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "আপুনি নীৰিক্ষণ কৰিব বিচৰা ভাষাসমূহৰ কাষত টাইপ কৰা শব্দসমূহ নীৰিক্ষণ কৰা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "আগ'ত বাৰ্তাসমূহৰ বিষয়ে অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
+msgid "Nick completed character"
+msgstr "নাম সম্পূৰ্ণকৰণৰ আখৰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "নতুন কথোপকথনসমূহৰ বিষয়ে অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"দলৰ সৈতে চেট কৰা সময়ত উপনাম সম্পূৰ্ণ (টেব) ব্যৱহাৰ কৰোতে উপনামৰ পিছত যোগ কৰিব "
+"লগিয়া আখৰ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "বাহিৰগামি বাৰ্তাসমূহৰ অধিসূচনা দিবলে এটা শব্দ বজোৱা হব নে।"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "চেটৰ উইন্ডোৰ আইকন ৰূপে Empathy দ্বাৰা পৰিচয়ৰ অৱতাৰ প্ৰয়োগ কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "এটা নেটৱাৰ্কত লগিন কৰোতে এটা শব্দ বজোৱা হব নে।"
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy -এ পৰিচয়ৰ অৱতাৰক চেট উইন্ডোৰ আইকন হিচাপে ব্যৱহাৰ কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "এটা নেটৱাৰ্কৰ পৰা লগ আউট কৰোতে এটা শব্দ বজোৱা হব নে।"
+msgid "Last account selected in Join Room dialog"
+msgstr "সৰ্বশেষ একাওন্টত ৰুম অংশগ্ৰহণ ডাইলগ নিৰ্বাচিত"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "আতৰত বা ব্যস্ত থাকোতে শব্দ অধিসূচনাসমূহ বজোৱা হব নে।"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "এটা ৰুমত অংশগ্ৰহণ কৰিবলে নিৰ্বাচিত সৰ্বশেষ একাওন্টৰ D-Bus অবজেক্ট পথ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "এজন পৰিচয় অফলাইন হওতে এটা পপআপ অধিসূচনা দেখাব লাগে নে।"
+msgid "Camera device"
+msgstr "কেমেৰা ডিভাইচ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "এজন পৰিচয় অনলাইন হওতে এটা পপআপ অধিসূচনা দেখাব লাগে নে।"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ভিডিঅ' কলসমূহত ব্যৱহাৰ কৰিব লগিয়া অবিকল্পিত কেমেৰা ডিভাইচ, যেনে /dev/video0।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"এটা নতুন বাৰ্তা গ্ৰহণ কৰোতে চেট ইতিমধ্যে খোলা থাকিলেও, কিন্তু মনোনিবেষিত নহয় এটা "
-"পপআপ অধিসূচনা দেখুৱা হব নে। "
+msgid "Camera position"
+msgstr "কেমেৰা অৱস্থান"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "এটা নতুন বাৰ্তা গ্ৰহণ কৰোতে এটা পপআপ অধিসূচনা দেখুৱা হব নে।"
+msgid "Position the camera preview should be during a call."
+msgstr "এটা কলৰ সময়ত কেমেৰা পূৰ্বদৰ্শন যি অৱস্থাত থাকিব লাগিব।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "একাওন্ট অৱশিষ্টসমূহ পৰিচয় তালিকাত দেখুৱা হব নে।"
+msgid "Echo cancellation support"
+msgstr "প্ৰতিধ্বনি বাতিল সমৰ্থন"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "পৰিচয় তালিকা আৰু চেট উইন্ডোসমূহত পৰিচয়সমূহৰ বাবে অৱতাৰসমূহ দেখুৱা হব নে।"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio ৰ প্ৰতিধ্বনি বাতিল কৰা পৰিস্ৰাৱন সামৰ্থবান কৰিব লাগে নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "পৰিচয় তালিকাত অফলাইন থকা পৰিচয়সমূহ দেখুৱা হব নে।"
+msgid "Show hint about closing the main window"
+msgstr "প্ৰধান উইন্ডো বন্ধ কৰাৰ বাবে ইঙ্গিত প্ৰদৰ্শন কৰক"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "আতৰত বা ব্যস্ত থাকোতে পপ আপ অধিসূচনাসমূহ দেখুৱা হব নে।"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"মূখ্য উইন্ডোক শীৰ্ষক বাৰৰ 'x' বুটামৰ সৈতে বন্ধ কৰাৰ বাৰ্তা ডাইলগক দেখুৱা হব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "পৰিচয় তালিকাৰ পৰিচয়সমূহৰ বাবে প্ৰটোকলসমূহ দেখুৱা হব নে।"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy দ্বাৰা ব্যৱহাৰকাৰীৰ ভৌগলিক অৱস্থান প্ৰকাশ কৰা সম্ভৱ হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "চেট ৰুমসমূহত পৰিচয় তালিকা দেখুৱা হব নে।"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy -এ ব্যৱহাৰকাৰীৰ অৱস্থান সিহতৰ পৰিচয়সমূহলে প্ৰকাশ কৰিব পাৰিব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "পৰিচয় তালিকাক সংকোচিত অৱস্থাত দেখুৱা হব নে।"
+msgid "Empathy can use the network to guess the location"
+msgstr "নেটৱাৰ্ক সহযোগে Empathy দ্বাৰা ভৌগলিক অৱস্থান গণনা কৰা সম্ভৱ হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"মূখ্য উইন্ডোক শীৰ্ষক বাৰৰ 'x' বুটামৰ সৈতে বন্ধ কৰাৰ বাৰ্তা ডাইলগক দেখুৱা হব নে।"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy -এ অৱস্থান ঠাওৰ কৰিবলে নেটৱাৰ্ক ব্যৱহাৰ কৰিব পাৰিব নে।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "চেট ৰুমসমূহৰ বাবে থীম ব্যৱহাৰ কৰা হব নে।"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "চেলুলাৰ নেটৱাৰ্ক সহযোগে Empathy দ্বাৰা ভৌগলিক অৱস্থান গণনা কৰা সম্ভৱ হ'ব"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-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."
-msgstr ""
-"পৰিচয় তালিকা সজাওতে কোনটো নিয়ম ব্যৱহাৰ কৰা হব। অবিকল্পিত হল পৰিচয়ৰ নামৰে সজোৱা "
-"\"নাম\" মানৰ সৈতে। \"state\" -ৰ মানে পৰিচয় তালিকাক অৱস্থাৰে সজাব।"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy -এ অৱস্থান ঠাওৰ কৰিবলে চেলুলাৰ নেটৱাৰ্ক ব্যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "বাৰ্তা আৰু VoIP একাওন্টসমূহ ব্যৱস্থাপনা কৰক"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "GPS সহযোগে Empathy দ্বাৰা ভৌগলিক অৱস্থান গণনা কৰা সম্ভৱ হ'ব"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "বাৰ্তা আৰু VoIP একাওন্টসমূহ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy -এ অৱস্থান ঠাওৰ কৰিবলে GPS ব্যৱহাৰ কৰিব পাৰিব নে।"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy দ্বাৰা ভৌগলিক অৱস্থানৰ নিৰ্ভুলতাৰ পৰিমাণ হ্ৰাস"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy -এ গোপনীয়তা কাৰণসমূহৰ বাবে অৱস্থানৰ সঠিকতা কমাব লাগে নে।"
+
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "কোনো কাৰণ উল্লিখিত নহয়"
+
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "অৱস্থাৰ পৰিবৰ্তন অনুৰোধ কৰা হৈছে"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "নথিপত্ৰ স্থানান্তৰৰ কাম আপুনি বাতিল কৰিছে"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "নথিপত্ৰ স্থানান্তৰৰ কাম অন্য ব্যৱহাৰকাৰী বাতিল কৰিছে"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "নথিপত্ৰ স্থানান্তৰ কৰিবলৈ সমস্যা"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "অন্য ব্যৱহাৰকাৰী নথিপত্ৰ স্থানান্তৰ কৰিবলৈ সক্ষম নহয়"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "অজ্ঞাত কাৰণ"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "নথিপত্ৰ স্থানান্তৰ সম্পূৰ্ণ হল, কিন্তু নথিপত্ৰ ক্ষতিগ্ৰস্থ আছিল"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "দূৰবৰ্তী পৰিচয় দ্বাৰা নথিপত্ৰ স্থানান্তৰ সমৰ্থিত নহয়"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "নিৰ্বাচিত নথিপত্ৰ এটা স্বাভাবিক নথিপত্ৰ নহয়"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "নিৰ্বাচিত নথিপত্ৰ ৰিক্ত"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
-msgstr "%s -ৰ পৰা মিচ কল"
+msgstr "%s ৰ পৰা মিচ কল"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
 #: ../libempathy/empathy-message.c:419
 #, c-format
 msgid "Called %s"
-msgstr "%s -ক কল কৰা হৈছিল"
+msgstr "%s ক কল কৰা হৈছিল"
 
 #: ../libempathy/empathy-message.c:422
 #, c-format
 msgid "Call from %s"
-msgstr "%s -ৰ পৰা কল"
-
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "ছ'কেটৰ ধৰন সমৰ্থিত নহয়"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "কোনো কাৰণ উল্লিখিত নহয়"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "অৱস্থাৰ পৰিবৰ্তন অনুৰোধ কৰা হৈছে"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "নথিপত্ৰ স্থানান্তৰৰ কাম আপুনি বাতিল কৰিছে"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "নথিপত্ৰ স্থানান্তৰৰ কাম অন্য ব্যৱহাৰকাৰী বাতিল কৰিছে"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "নথিপত্ৰ স্থানান্তৰ কৰিবলৈ সমস্যা"
+msgstr "%s ৰ পৰা কল"
 
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "অন্য ব্যৱহাৰকাৰী নথিপত্ৰ স্থানান্তৰ কৰিবলৈ সক্ষম নহয়"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "অজ্ঞাত কাৰণ"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "উপস্থিত"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ব্যস্ত"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "আতৰত"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "অদৃশ্য"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "অফ-লাইন"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "কোনো কাৰণ ধাৰ্য্য কৰা হোৱা নাই"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "অৱস্থা অফলাইনলে সংহতি কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "নেটৱাৰ্ক  ত্ৰুটি"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "প্ৰমাণীকৰণ ব্যৰ্থ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "এনক্ৰিপছন  ত্ৰুটি"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "নাম বৰ্তমানে ব্যৱহৃত হৈছে"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "প্ৰমাণপত্ৰ উপলব্ধ কৰা নহয়"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "প্ৰমাণপত্ৰ বিশ্বস্ত নহয়"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "প্ৰমাণপত্ৰৰ সময়সীমা উত্তীৰ্ণ হৈছে"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "প্ৰমাণপত্ৰ সক্ৰিয় কৰা নহয়"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "প্ৰমাণপত্ৰৰ হস্টনাম লৈ অমিল"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "প্ৰমাণপত্ৰৰ ফিনঙ্গাৰপ্ৰিন্ট লৈ অমিল"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "স্বয়ং স্বাক্ষৰিত প্ৰমাণপত্ৰ"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "প্ৰমাণপত্ৰ  ত্ৰুটি"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "ইনক্ৰিপষণ উপলব্ধ নহয়"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "প্ৰমাণপত্ৰ অবৈধ"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "সংযোগ নাকচ কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "সংযোগ স্থাপন কৰিব নোৱাৰি"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "সংযোগ হেৰাইছে"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "সম্পদ ইতিমধ্যে চাৰ্ভাৰৰ সৈতে সংযোগিত"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "এই একাওন্ট ইতিমধ্যে চাৰ্ভাৰৰ সৈতে সংযোগিত"
 
-#: ../libempathy/empathy-utils.c:356
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:357
+msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "সংযোগক একে সম্পদ ব্যৱহাৰ কৰি এটা নতুন সংযোগৰে প্ৰতিস্থাপন কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "একাওন্ট ইতিমধ্যে চাৰ্ভাৰত উপস্থিত"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "চাৰ্ভাৰ সংযোগ ব্যৱস্থাপনা কৰিবলে বৰ্তমানে অতি ব্যস্ত"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "প্ৰমাণপত্ৰ প্ৰত্যাহাৰ কৰা হৈছে"
 
-#: ../libempathy/empathy-utils.c:365
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "প্ৰমাণপত্ৰয় এটা অসুৰক্ষিত চিফাৰ এলগৰিথম ব্যৱহাৰ কৰে অথবা ক্ৰিপ্টোগ্ৰাফিয়ভাৱে দুৰ্বল"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -690,283 +699,277 @@ msgstr ""
 "চাৰ্ভাৰ প্ৰমাণপত্ৰৰ দৈৰ্ঘ, অথবা চাৰ্ভাৰ প্ৰমাণপত্ৰ শৃংখলৰ গভীৰতা, ক্ৰিপ্টোগ্ৰাফী "
 "লাইব্ৰেৰীয়ে প্ৰণয়ন কৰা সীমাসমূহত অতিক্ৰম কৰে"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "আপোনাৰ চফ্টৱেৰ অতি পুৰনি"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "অভ্যন্তৰীক ত্ৰুটি"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "ওচৰৰ ব্যক্তিৰ"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ছেকেণ্ড আগতে"
 msgstr[1] "%d ছেকেণ্ড আগতে"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d মিনিট আগতে"
 msgstr[1] "%d মিনিট আগতে"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ঘন্টা আগতে"
 msgstr[1] "%d ঘন্টা আগতে"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d দিন আগতে"
 msgstr[1] "%d দিন আগতে"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d সপ্তাহ আগতে"
 msgstr[1] "%d সপ্তাহ আগতে"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d মাহ আগতে"
 msgstr[1] "%d মাহ আগতে"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "ভবিষ্যতে"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "পাছৱাৰ্ড পোৱা নগল"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s (%s) ৰ বাবে IM একাওন্ট পাছৱাৰ্ড"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "একাওন্ট %s (%s) ত চেটৰুম '%s' ৰ বাবে পাছৱাৰ্ড"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "সকলো একাওন্ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "একাওন্ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "পাছৱাৰ্ড"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "চাৰ্ভাৰ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "পোৰ্ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "মোৰ ৱেব একাওন্টসমূহ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "একাওন্ট %s -ক %s -ৰে সম্পাদন কৰা হৈছে।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "একাওন্ট %s -ক Empathy -ত সম্পাদন কৰিব নোৱাৰি।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "মোৰ ৱেব একাওন্টসমূহ লঞ্চ কৰক"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "%s সম্পাদনা কৰক"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ব্যৱহাৰকাৰীৰ নাম:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "প্ৰয়োগ কৰক (_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "লগিন কৰক (_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "এই একাওন্ট ইতিমধ্যে চাৰ্ভাৰত অস্তিত্ববান"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "চাৰ্ভাৰত এটা নতুন একাওন্ট সৃষ্টি কৰক"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "বাতিল কৰক (_n)"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s %2$s ত"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s একাওন্ট"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "নতুন একাওন্ট"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>উদাহৰণ:</b> মোৰপৰ্দানাম"
+#: ../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:"
+msgstr "পাছৱাৰ্ড: (_w)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "উন্নত বিকল্প"
+msgid "Screen _Name:"
+msgstr "পৰ্দাত ব্যৱহৃত নাম: (_N)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>উদাহৰণ:</b> মোৰপৰ্দানাম"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "পাছৱাৰ্ড: (_w)"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "পাছৱাৰ্ড মনত ৰাখক"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "পাছৱাৰ্ড মনত ৰাখক"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "পোৰ্ট: (_P)"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "পাছৱাৰ্ড মনত ৰাখক"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "পৰ্দাত ব্যৱহৃত নাম: (_N)"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "চাৰ্ভাৰ: (_S)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "আপোনাৰ AIM পাছৱাৰ্ড কি ?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "উন্নত বিকল্প"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "আপোনাৰ AIM একাওন্টৰ ব্যৱহাৰকাৰীৰ-নাম কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "পোৰ্ট: (_P)"
+msgid "What is your AIM password?"
+msgstr "আপোনাৰ AIM পাছৱাৰ্ড কি ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "চাৰ্ভাৰ: (_S)"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>উদাহৰণ:</b> ব্যৱহাৰকাৰীনাম"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "পাছৱাৰ্ড মনত ৰাখক"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "লগিন ID: (_D)"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>উদাহৰণ:</b> ব্যৱহাৰকাৰীনাম"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "আপোনাৰ GroupWise ব্যৱহাৰকাৰীৰ ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "আপোনাৰ GroupWise পাছৱাৰ্ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>উদাহৰণ:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "আখৰ সংহতি (_a):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "আপোনাৰ ICQ UIN কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ICQ পাছৱাৰ্ড কি ?"
 
@@ -1003,11 +1006,23 @@ msgstr "বিকল্পসমূহ"
 msgid "None"
 msgstr "কোনো নহয়"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "নেটৱাৰ্ক"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "নেটৱাৰ্ক:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "আখৰ সংহতি:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "চাৰ্ভাৰসমূহ"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1015,14 +1030,6 @@ msgstr ""
 "সৰহভাগ IRC চাৰ্ভাৰসমূহৰ এটা পাছৱাৰ্ডৰ প্ৰয়োজন নহয়, সেয়েহে যদি আপুনি নিশ্চিত নহয়, "
 "এটা পাছৱাৰ্ড নসোমাব।"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "নেটৱাৰ্ক"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "নেটৱাৰ্ক:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "উপনাম:"
@@ -1039,48 +1046,20 @@ msgstr "প্ৰস্থানসময়ত প্ৰদৰ্শিত বা�
 msgid "Real name:"
 msgstr "প্ৰকৃত নাম:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "চাৰ্ভাৰসমূহ"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "আপোনাৰ IRC উপনাম কি?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "কোন IRC নেটৱাৰ্ক?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>উদাহৰণ:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>উদাহৰণ:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ইনক্ৰিপষণৰ প্ৰয়োজন (TLS/SSL) (_y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL প্ৰমাণপত্ৰ ত্ৰুটিসমূহ উপেক্ষা কৰক (_g)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "চাৰ্ভাৰৰ বৈশিষ্ট্য উপেক্ষা কৰক"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "গুৰুত্ব (_t):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "আপোনাৰ IRC উপনাম কি?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "সম্পদ: (_u)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "আপোনাৰ Facebook ব্যৱহাৰকাৰীনাম কি?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1092,179 +1071,203 @@ msgstr ""
 "যদি আপোনাৰ এটা Facebook ব্যৱহাৰকাৰীনাম নাই এটা বাছইবলে <a href=\"http://www."
 "facebook .com/username/\">এই পৃষ্ঠা ব্যৱহাৰ কৰক</a>।"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "পুৰনি SSL ব্যৱহাৰ কৰা হ'ব (_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "আপোনাৰ Facebook পাছৱাৰ্ড কি?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "আপোনাৰ Facebook ব্যৱহাৰকাৰীনাম কি?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "আপোনাৰ Google ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>উদাহৰণ:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "আপোনাৰ Google পাছৱাৰ্ড কি ?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>উদাহৰণ:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL প্ৰমাণপত্ৰ ত্ৰুটিসমূহ উপেক্ষা কৰক (_g)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "গুৰুত্ব (_t):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "সম্পদ: (_u)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ইনক্ৰিপষণৰ প্ৰয়োজন (TLS/SSL) (_y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "পুৰনি SSL ব্যৱহাৰ কৰা হ'ব (_L)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "চাৰ্ভাৰৰ বৈশিষ্ট্য উপেক্ষা কৰক"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "আপোনাৰ Jabber ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "আপোনাৰ Jabber পাছৱাৰ্ড কি ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "আপোনাৰ পছন্দৰ Jabber ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "আপোনাৰ Jabber পাছৱাৰ্ড কি ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "আপোনাৰ পছন্দৰ Jabber পাছৱাৰ্ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>উদাহৰণ:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "আপোনাৰ Windows Live ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "আপোনাৰ Windows Live পাছৱাৰ্ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ই-মেইল ঠিকনা (_m):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "উপনাম (_k):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "পদবি: (_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "নাম: (_F)"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "প্ৰকাশিত নাম: (_P)"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "পদবি: (_L)"
+msgid "E-_mail address:"
+msgstr "ই-মেইল ঠিকনা (_m):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "প্ৰকাশিত নাম: (_P)"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ব্যৱহাৰকাৰীৰ নাম: (_U)"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>উদাহৰণ:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "প্ৰমাণীকৰণ ব্যৱহাৰকাৰীনাম:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "বান্ধনী খোজ কৰক"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN চাৰ্ভাৰ স্বচালিতভাৱে খোজ কৰক"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "এই একাওন্টক লেন্ডলাইন আৰু মবাইল ফোনসমূহ কল কৰিবলে ব্যৱহাৰ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS ত্ৰুটিসমূহ উপেক্ষা কৰক"
+msgid "NAT Traversal Options"
+msgstr "NAT ভ্ৰমণ বিকল্পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "অন্তৰাল (ছেকেণ্ডসমূহ)"
+msgid "Proxy Options"
+msgstr "প্ৰক্সি বিকল্পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "জীৱন্ত-ৰাখক বিকল্পসমূহ"
+msgid "Miscellaneous Options"
+msgstr "বহু বিকল্পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ঢিলা ৰুটিং"
+msgid "STUN Server:"
+msgstr "STUN চাৰ্ভাৰ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "পদ্ধতি:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN চাৰ্ভাৰ স্বচালিতভাৱে খোজ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "বহু বিকল্পসমূহ"
+msgid "Discover Binding"
+msgstr "বান্ধনী খোজ কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT ভ্ৰমণ বিকল্পসমূহ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "চাৰ্ভাৰ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "জীৱন্ত-ৰাখক বিকল্পসমূহ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "পোৰ্ট:"
+msgid "Mechanism:"
+msgstr "পদ্ধতি:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "প্ৰক্সি বিকল্পসমূহ"
+msgid "Interval (seconds)"
+msgstr "অন্তৰাল (ছেকেণ্ডসমূহ)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "প্ৰমাণীকৰণ ব্যৱহাৰকাৰীনাম:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "পৰিৱহন:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN চাৰ্ভাৰ:"
+msgid "Loose Routing"
+msgstr "ঢিলা ৰুটিং"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "চাৰ্ভাৰ:"
+msgid "Ignore TLS Errors"
+msgstr "TLS ত্ৰুটিসমূহ উপেক্ষা কৰক"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "পৰিৱহন:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "এই একাওন্টক লেন্ডলাইন আৰু মবাইল ফোনসমূহ কল কৰিবলে ব্যৱহাৰ কৰক"
+msgid "Port:"
+msgstr "পোৰ্ট:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "আপোনাৰ SIP একাওন্টৰ পাছৱাৰ্ড কি ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "আপোনাৰ SIP লগিন ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ব্যৱহাৰকাৰীৰ নাম: (_U)"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "আপোনাৰ SIP একাওন্টৰ পাছৱাৰ্ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! ID (_D):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "কনফাৰেঞ্চ আৰু চেট ৰুম নিমন্ত্ৰণসমূহ উপেক্ষা কৰক (_g)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ৰুম তালিকাৰ স্থানীয়: (_R)"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "আপোনাৰ Yahoo! ID কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "আপোনাৰ Yahoo! পাছৱাৰ্ড কি ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! ID (_D):"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ৰুম তালিকাৰ স্থানীয়: (_R)"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1302,211 +1305,228 @@ msgstr "সকলো নথিপত্ৰ"
 msgid "Click to enlarge"
 msgstr "ডাঙৰ মাপত প্ৰদৰ্শনৰ বাবে ক্লিক কৰক"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "কল আৰম্ভ কৰোতে এটা ত্ৰুটি হৈছিল"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "ধাৰ্য্য কৰা পৰিচয়ে কলসমূহৰ সমৰ্থন নকৰে"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "ধাৰ্য্য কৰা পৰিচয় অফলাইন"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "ধাৰ্য্য কৰা পৰিচয় বৈধ নহয়"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "এই প্ৰটোকলত আপাতকালীন কলসমূহ সমৰ্থিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "আপোনাৰ এই কল উপস্থাপন কৰিবলে পৰ্যাপ্ত দেন নাই"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "ব্যক্তিগত চেট খোলিবলে ব্যৰ্থ"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "বিষয় এই কথোপকথনত সমৰ্থিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "আপোনাৰ এই বিষয় সলনি কৰাৰ অনুমতি নাই"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” এটা বৈধ পৰিচয় ID নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: বৰ্তমান কথোপকথনৰ পৰা সকলো বাৰ্তা পৰিষ্কাৰ কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: বৰ্তমান কথোপকথনৰ বিষয় সংহতি কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: এটা নতুন চেট ৰুমত যোগদান কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: এটা নতুন চেট ৰুমত যোগদান কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<chat room ID>] [<reason>]: চেট ৰুম এৰক, অবিকল্পিতভাৱে বৰ্তমানটো"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: এটা ব্যক্তিগত চেট খোলক"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: এটা ব্যক্তিগত চেট খোলক"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: বৰ্তমান চাৰ্ভাৰত আপোনাৰ উপনাম সলনি কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: বৰ্তমান কথোপকথনলে ACTION বাৰ্তা পঠাওক"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <message>: বৰ্তমান কথোপকথনলে <message> পঠাওক। ইয়াক এটা  '/' -ৰে আৰম্ভ "
-"হোৱা বাৰ্তা পঠাবলে ব্যৱহাৰ কৰা হয়। উদাহৰণস্বৰূপ: \"/say /join -ক এটা নতুন চেট "
-"ৰুমলে যোগদান কৰিবলে ব্যৱহাৰ কৰা হয়\""
+"হোৱা বাৰ্তা পঠাবলে ব্যৱহাৰ কৰা হয়। উদাহৰণস্বৰূপ: \"/say /join ক এটা নতুন চেট ৰুমলে "
+"যোগদান কৰিবলে ব্যৱহাৰ কৰা হয়\""
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: এজন পৰিচয়ৰ বিষয়ে তথ্য প্ৰদৰ্শন কৰে"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<command>]: সকলো সমৰ্থিত কমান্ড দেখুৱাওক। যদি <command> -ৰ বিৱৰণ দিয়া "
+"/help [<command>]: সকলো সমৰ্থিত কমান্ড দেখুৱাওক। যদি <command> ৰ বিৱৰণ দিয়া "
 "আছে, ইয়াৰ ব্যৱহাৰ দেখুৱাওক।"
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "ব্যৱহাৰ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "অজ্ঞাত কমান্ড"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "অজ্ঞাত কমান্ড; উপলব্ধ কমান্ডসমূহৰ বাবে /help চাওক"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "বাৰ্তা পঠাবলে অপৰ্যাপ্ত মেমৰি আছে"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "'%s' বাৰ্তা পঠিয়াবলৈ সমস্যা: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "বাৰ্তা পঠাবলে ত্ৰুটি: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "বাৰ্তা পঠাবলে অপৰ্যাপ্ত বেলেঞ্চ। <a href='%s'>টপ আপ</a>।"
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ক্ষমতাবান নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "অফ-লাইন"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "পৰিচিত ব্যক্তিৰ তথ্য বৈধ নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "অনুমতি প্ৰদান কৰা নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "বাৰ্তা অত্যাধিক দীঘল"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "প্ৰয়োগ কৰা নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "অজ্ঞাত"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "'%s' বাৰ্তা পঠিয়াবলৈ সমস্যা: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "বাৰ্তা পঠাবলে ত্ৰুটি: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "বিষয়:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "নিৰ্ধাৰিত বিষয়: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "বিষয় %s দ্বাৰা সংহত: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "বিষয় নিৰ্ধাৰিত নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(প্ৰস্তাবিত তথ্য অনুপস্থিত)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr "'%s' -ক শব্দকোষলে যোগ কৰক"
+msgstr "'%s' ক শব্দকোষলে যোগ কৰক"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr "'%s' -ক %s শব্দকোষলে যোগ কৰক"
+msgstr "'%s' ক %s শব্দকোষলে যোগ কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "স্মাইলি আখৰ অন্তৰ্ভুক্ত কৰক"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "পঠিয়াই দিয়ক (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "প্ৰস্তাবিত বানান (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "শেহতীয়া লগসমূহ উদ্ধাৰ কৰোতে ব্যৰ্থ হল"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হৈছে"
@@ -1514,12 +1534,12 @@ msgstr "%s ৰ সৈতে সংযোগ বিচ্ছিন্ন কৰ�
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ক %2$s দ্বাৰা বিতাড়ন কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ক বিতাড়ন কৰা হৈছে"
@@ -1527,17 +1547,17 @@ msgstr "%s ক বিতাড়ন কৰা হৈছে"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ক %2$s দ্বাৰা প্ৰতিৰোধ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s ক প্ৰতিৰোধ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ৰুমৰ পৰা ওলাই গৈছে"
@@ -1547,17 +1567,17 @@ msgstr "%s ৰুমৰ পৰা ওলাই গৈছে"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ৰুমত আহিছে"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s এতিয়া %s হিচাপে জনাজাত"
@@ -1565,90 +1585,90 @@ msgstr "%s এতিয়া %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:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "বিচ্ছিন্ন"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "আপুনি এই পাছৱাৰ্ড সংৰক্ষণ কৰিব বিচাৰে নে?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "মনত ৰাখক"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "এতিয়া নহয়"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "পুনৰ চেষ্টা কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "ভুল পাছৱাৰ্ড। অনুগ্ৰহ কৰি পুনৰ চেষ্টা কৰক।:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "এই ৰুম এটা পাছৱাৰ্ডৰে সুৰক্ষিত:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "যোগদান কৰক"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "সংযুক্ত"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "চেট"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "অজ্ঞাত অথবা অবৈধ চিনাক্তক"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "পৰিচয় প্ৰতিৰোধ কৰা অস্থায়ীভাৱে উপলব্ধ নহয়"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "পৰিচয় প্ৰতিৰোধ কৰা উপলব্ধ নহয়"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "অনুমতি নাকচ কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "পৰিচয় প্ৰতিৰোধ কৰিব নোৱাৰি"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "প্ৰতিৰোধ কৰা পৰিচয়সমূহ সম্পাদনা কৰক"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "একাওন্ট"
 
@@ -1658,464 +1678,369 @@ msgstr "প্ৰতিৰোধ কৰা পৰিচয়সমূহ"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "আতৰাওক"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "লিঙ্ক দ্বাৰা চিহ্নিত ঠিকনা নকল কৰক (_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "সংযোগ খোলক (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "যোগাযোগ  তথ্য পৰিবৰ্তন কৰক"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "ব্যক্তিগত তথ্য"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "নতুন পৰিচয়"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s প্ৰতিৰোধ কৰিবনে?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
-"আপুনি নিশ্চিত নে আপুনি '%s' -ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা প্ৰতিৰোধ কৰিব বিচাৰে?"
+"আপুনি নিশ্চিত নে আপুনি '%s' ক আপোনাৰ লগত যোগাযোগ কৰাৰ পৰা প্ৰতিৰোধ কৰিব বিচাৰে?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "প্ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "এই পৰিচয় নিন্দুক হিচাপে সংবাদন কৰক (_R)"
 msgstr[1] "এই পৰিচয়সমূহক নিন্দুক হিচাপে সংবাদন কৰক (_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "পিছত নিৰ্ধাৰণ কৰা হ'ব (_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "স্বাক্ষৰণৰ অনুৰোধ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ব্যৱহাৰকাৰীক প্ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "দলীয় নহয়"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "পছন্দৰ মানুহ"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "'%s' নামৰ দল নিশ্চিতৰূপে আঁতৰাবলৈ ইচ্ছুক নে ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "দল আঁতৰুৱা হৈছে"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "আঁতৰাওক (_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "আপুনি নিশ্চিতৰূপে '%s' ক পৰিচিত তালিকাৰ পৰা আঁতৰাবলৈ ইচ্ছুক নে ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "পৰিচিত ব্যক্তিক আঁতৰুৱা হৈছে"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "পৰিচয় যোগ কৰক (_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "পৰিচয় প্ৰতিৰোধ কৰক (_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "চেট (_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "অডিঅ' কল (_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "ভিডিঅ' কল (_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "পূৰ্ববৰ্তী কথোপকথনসমূহ (_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "নথিপত্ৰ পঠিয়াওক"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "মোৰ ডেস্কটপ অংশীদাৰী কৰক"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "পছন্দৰ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "তথ্য (_m)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "সম্পাদনা কৰক (_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "আপোনাক এই ৰুমলৈ আমন্ত্ৰণ জনোৱা হৈছে"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "চেট ৰুমলৈ আমন্ত্ৰণ কৰক (_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "পিছত নিৰ্ধাৰণ কৰা হ'ব (_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "পৰিচয়সমূহ বিচাৰক"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "সন্ধান কৰক: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "পৰিচয় যোগ কৰক (_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "কোনো পৰিচয় পোৱা নগল"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "আপোনাৰ পৰিচয় দিয়া বাৰ্তা:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "অনুগ্ৰহ কৰি যেতিয়া আপুনি অনলাইন থাকে মোক চাব দিব। ধন্যবাদ!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "এটা পৰিচয় নিৰ্বাচন কৰক"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "সম্পূৰ্ণ নাম:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "ফোন নম্বৰ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ই-মেইল ঠিকনা:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ৱেবছাইট:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "জন্মদিন:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "শেষ দেখা হৈছিল:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "পৰা সংযুক্ত:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "আতৰত বাৰ্তা:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "চেনেলসমূহ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "দেশৰ ISO কোড:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "দেশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ৰাজ্য:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "নগৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "অঞ্চল:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "পোস্টেল কোড:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "ৰাস্তা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "বিল্ডিং:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "তল:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ঘৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "লিখনী:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "বিৱৰণ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "যথাৰ্থতাৰ মাত্ৰা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "ত্ৰুটি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "উলম্ব দিশৰ ত্ৰুটি (মিটাৰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "অনুভূমিক দিশৰ ত্ৰুটি (মিটাৰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "গতি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "বিয়েৰিং:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "আৰোহণৰ গতি:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "সৰ্বশেষ উন্নয়নৰ তাৰিখ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "দ্ৰাঘিমাংশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "অক্ষাংশ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "উচ্চতা:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "অৱস্থান"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y %R UTC ত"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "অৱতাৰৰ ছবি সংৰক্ষণ কৰক"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "অৱতাৰৰ ছবি সংৰক্ষণ কৰিবলৈ ব্যৰ্থ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>অৱস্থান</b> (date) ত\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "উপনাম:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "গ্ৰাহক  তথ্য"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "গ্ৰাহক:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "ব্যক্তিগত বিৱৰণসমূহ"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "যোগাযোগ  বিবৰণ"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "সম্পূৰ্ণ নাম"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "ফোন নম্বৰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "ই-মেইল ঠিকনা"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "ৱেবছাইট"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "জন্মদিন"
+
+#. 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 "শেষ দেখা হৈছিল:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "পৰা সংযুক্ত:"
+
+#. 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 "আতৰত বাৰ্তা:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "কৰ্ম"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "ঘৰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "মবাইল"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "মাত"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "পছন্দৰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "ডাক সম্বন্ধীয়"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "পাৰ্চেল"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "চিনাক্তআখৰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "উপনাম:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>অৱস্থান</b> (date) ত\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "তথ্য অনুৰোধ কৰা হৈছে…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "গ্ৰাহক  তথ্য"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "সংস্কৰণ:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "গ্ৰাহক:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "দলসমূহ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2123,105 +2048,170 @@ msgstr ""
 "দলসমূহ যত আপুনি এই পৰিচয় উপস্থিত থকাটো বিচাৰে নিৰ্বাচন কৰক। মনব কৰিব যে আপুনি "
 "এটাতকে বেছি দল অথবা কোনো দল নহয় নিৰ্বাচন কৰিব পাৰিব। "
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "দল যোগ কৰক (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "নিৰ্বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "দল"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "নিম্নলিখিত পৰিচয় প্ৰতিৰোধ কৰা হব:"
 msgstr[1] "নিম্নলিখিত পৰিচয়সমূহ প্ৰতিৰোধ কৰা হব:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "নিম্নলিখিত পৰিচয় প্ৰতিৰোধ কৰিব নোৱাৰি:"
 msgstr[1] "নিম্নলিখিত পৰিচয়সমূহ প্ৰতিৰোধ কৰিব নোৱাৰি:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "সংযুক্ত পৰিচয়সমূহ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "সংযোগ কৰিবলে পৰিচয়সমূহ বাছক"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "নতুন পৰিচয় পূৰ্বদৰ্শন"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "বাওফালে থকা তালিকাত নিৰ্বাচন কৰা পৰিচয়সমূহ একেলগে সংযুক্ত কৰা হব।"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "যোগাযোগ  তথ্য পৰিবৰ্তন কৰক"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "কল স্থাপনা কৰিবলে ব্যৱহাৰ কৰিব লগিয়া একাওন্ট বাছক"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "কল"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "মবাইল"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "কৰ্ম"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HOME"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "পৰিচয় প্ৰতিৰোধ কৰক (_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "চেট (_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "SMS (_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "অডিঅ' কল (_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ভিডিঅ' কল (_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "পূৰ্ববৰ্তী কথোপকথনসমূহ (_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "নথিপত্ৰ পঠিয়াওক"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "মোৰ ডেস্কটপ অংশীদাৰী কৰক"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "পছন্দৰ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ইনস্টল নাই"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "পৰিচয় বিৱৰণসমূহ অভিগম কৰিবলে অনুগ্ৰহ কৰি gnome-contacts ইনস্টল কৰক।"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "তথ্য (_m)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "সম্পাদনা কৰক (_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "পৰিচয়সমূহ সংযোগ কৰক (_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "আপোনাক এই ৰুমলৈ আমন্ত্ৰণ জনোৱা হৈছে"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "চেট ৰুমলৈ আমন্ত্ৰণ কৰক (_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "পৰিচয় যোগ কৰক (_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "মচি পেলাওক আৰু প্ৰতিৰোধ কৰক (_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "'%s' নামৰ দল নিশ্চিতৰূপে আঁতৰাবলৈ ইচ্ছুক নে ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "দল আঁতৰুৱা হৈছে"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "আঁতৰাওক (_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "আপুনি নিশ্চিতৰূপে '%s' ক পৰিচিত তালিকাৰ পৰা আঁতৰাবলৈ ইচ্ছুক নে ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2230,7 +2220,11 @@ msgstr ""
 "আপুনি সঁচাকে সংযুক্ত পৰিচয় '%s' আতৰাব বিচাৰে নে? মন কৰিব যে ই সকলো পৰিচয় যি এই "
 "সংযুক্ত পৰিচয় বনায় আতৰাই পেলাব।"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "পৰিচিত ব্যক্তিক আঁতৰুৱা হৈছে"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2239,25 +2233,25 @@ msgstr[1] "%u পৰিচয়সমূহ অন্তৰ্ভুক্ত ক�
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
-msgstr "<b>অৱস্থান</b> (date) -ত"
+msgstr "<b>অৱস্থান</b> (date) ত"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "এটা ফোন বা মবাইল ডিভাইচৰ পৰা অনলাইন"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "নতুন নেটৱাৰ্ক"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "এটা IRC নেটৱাৰ্ক বাছক"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "নেটৱাৰ্কসমূহৰ তালিকা পুনৰ সংহতি কৰক (_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "নিৰ্বাচন কৰক"
@@ -2270,254 +2264,257 @@ msgstr "নতুন চাৰ্ভাৰ"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "পৰিচয়সমূহ সংযুক্ত কৰক"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "অসংযুক্ত কৰক (_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "প্ৰদৰ্শিত সংযুক্ত পৰিচয়সমূহক পৃথক পৰিচয়সমূহত সম্পূৰ্ণভাৱে বিভাজন কৰক।"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "সংযুক্ত কৰক (_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "সংযুক্ত পৰিচয়সমূহ '%s' অসংযুক্ত কৰিব নে?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"আপুনি নিশ্চিত নে আপুনি এই সংযুক্ত পৰিচয়সমূহ অসংযুক্ত কৰিব বিচাৰে? ই সংযুক্ত পৰিচয়সমূহক "
-"সম্পূৰ্ণভাৱে পৃথক পৰিচয়সমূহত বিভাজন কৰিব।"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "অসংযুক্ত কৰক (_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "ইতিহাস"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "দেখুৱাওক"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "অনুসন্ধান"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
-msgstr "%s -ত চেট কৰক"
+msgstr "%s ত চেট কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
-msgstr "%s -ৰ সৈতে চেট কৰক"
+msgstr "%s ৰ সৈতে চেট কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ছেকেণ্ড"
 msgstr[1] "%s ছেকেণ্ড"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s মিনিট"
 msgstr[1] "%s মিনিট"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
-msgstr "কলে %s ললে, %s -ত সমাপ্ত হল"
+msgstr "কলে %s ললে, %s ত সমাপ্ত হল"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "আজি"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "যোৱাকালী"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "যেতিয়া তেতিয়া"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "যোনে-তোনে"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "কোন"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "কেতিয়া"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "যিকোনো বস্তু"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "লিখনী চেটসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "আগ'ত কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "বাহিৰগামি কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "মিচ কলসমূহ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "কি"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "আপুনি নিশ্চিত নে আপুনি পূৰ্বৱৰ্তী কথোপকথনৰ সকলো লগ মচি পেলাব বিচাৰে?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "সকলো পৰিষ্কাৰ কৰক"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "পৰা মচি পেলাওক:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">ল'ড কৰা হৈ আছে...</span>"
+msgid "_File"
+msgstr "নথিপত্ৰ (_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "চেট"
+#: ../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 "সম্পাদনা (_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "সকলো ইতিহাস মচি পেলাওক..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "আলেখ্য"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "ভিডিঅ'"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "চেট"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "সম্পাদনা (_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "ভিডিঅ'"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "নথিপত্ৰ (_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "পৃষ্ঠা ২"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "পৰিচয়ৰ ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ল'ড কৰা হৈ আছে...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "পৰিচয় অফলাইন"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "চেট (_h)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "ধাৰ্য্য কৰা পৰিচয় হয় অবৈধ অথবা অজ্ঞাত"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "পৰিচয় এই ধৰণৰ কথোপকথন সমৰ্থন নকৰে"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "অনুৰোধ কৰা কাৰ্য্যকৰীতা এই প্ৰটোকলৰ বাবে প্ৰণয়ন কৰা হোৱা নাই"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "প্ৰদান কৰা পৰিচয়ৰ সৈতে এটা কথোকথন আৰম্ভ কৰিব নোৱাৰি"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "আপোনাক এই চেনেলৰ পৰা বহিষ্কাৰ কৰা হৈছে"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "এই চেনেল পূৰ্ণ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "আপুনি এই চেনেল অংশগ্ৰহণ কৰিবলে আমন্ত্ৰণ জনাব লাগিব"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "বিচ্ছিন্নিত অৱস্থাত আগবাঢ়িব নোৱাৰি"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "অনুমতি নাকচ কৰা হৈছে"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "কথোপকথন আৰম্ভ কৰোতে এটা ত্ৰুটি হৈছিল"
+
+#: ../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 "হয় এটা পৰিচয় চিনাক্তক অথবা ফোন নম্বৰ:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "নতুন কথোপকথন "
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "ভিডিঅ' পঠাওক (_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "ভিডিঅ' কল (_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "কল (_a)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "অডিঅ' কল (_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "নতুন কল"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "একাওন্ট <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 ""
-"একাওন্ট <b>%s</b> -ৰ বাবে\n"
+"একাওন্ট <b>%s</b> ৰ বাবে\n"
 "আপোনাৰ পাছৱাৰ্ড সোমাওক"
 
 #. COL_STATUS_TEXT
@@ -2548,12 +2545,8 @@ msgstr "এই অৱস্থা বাৰ্তাক পছন্দৰ ত�
 msgid "Set status"
 msgstr "অৱস্থা নিৰ্ধাৰণ কৰক"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "আপোনাৰ উপস্থিতি আৰু বৰ্তমান অৱস্থাৰ তথ্য নিৰ্ধাৰণ কৰক"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "স্বনিৰ্বাচিত বাৰ্তাসমূহ…"
 
@@ -2561,7 +2554,7 @@ msgstr "স্বনিৰ্বাচিত বাৰ্তাসমূহ…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "নতুন %s একাওন্ট"
@@ -2571,20 +2564,20 @@ msgid "Find:"
 msgstr "সন্ধান কৰক:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "ফলা মিল খোৱাওক (_c)"
+msgid "_Previous"
+msgstr "পূৰ্ববৰ্তী (_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "বাক্যাংশ পোৱা নগল"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "পৰবৰ্তী (_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "ফলা মিল খোৱাওক (_c)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "পূৰ্ববৰ্তী (_P)"
+msgid "Phrase not found"
+msgstr "বাক্যাংশ পোৱা নগল"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2630,12 +2623,12 @@ msgstr "ভাষাৰ কল সমাপ্ত হৈছে"
 msgid "Edit Custom Messages"
 msgstr "স্বনিৰ্বাচিত বাৰ্তা সম্পাদনা"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
-msgstr "বাৰ্তা %s -ত সম্পাদনা কৰা হৈছে"
+msgstr "বাৰ্তা %s ত সম্পাদনা কৰা হৈছে"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "স্বাভাৱিক"
 
@@ -2684,8 +2677,7 @@ msgid "The certificate is self-signed."
 msgstr "প্ৰমাণপত্ৰ স্ব-স্বাক্ষৰীত।"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr "প্ৰমাণপত্ৰক প্ৰেৰণকাৰী প্ৰমাণপত্ৰ কতৃপক্ষ দ্বাৰা প্ৰত্যাহাৰ কৰা হৈছে।"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2711,34 +2703,38 @@ msgid "Certificate hostname: %s"
 msgstr "প্ৰমাণপত্ৰ হস্টনাম: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "চলাই থাকক"
+msgid "C_ontinue"
+msgstr "চলাই থাকক (_o)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "ভৰষাহিন সংযোগ"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "এই সংযোগ ভৰষা কৰিব নোৱাৰি। আপুনি তথাপিও আগবাঢ়িব বিচাৰে নে?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "এই পছন্দক ভৱিষ্যত সংযোগসমূহৰ বাবে মনত ৰাখিব"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "প্ৰমাণপত্ৰ বিৱৰণসমূহ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "URI খুলিবলৈ ব্যৰ্থ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "এটা নথিপত্ৰ নিৰ্বাচন কৰক"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "নথিপত্ৰ সংৰক্ষণ কৰিবলে অপৰ্যাপ্ত ৰিক্ত স্থান"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2747,10 +2743,10 @@ msgstr ""
 "এই নথিপত্ৰ সাঁচিবলে %s ৰিক্ত স্থানৰ প্ৰয়োজন, কিন্তু কেৱল %s উপলব্ধ। অনুগ্ৰহ কৰি অন্য "
 "অৱস্থান বাছক।"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
-msgstr "%s -ৰ পৰা আগ'ত নথিপত্ৰ"
+msgstr "%s ৰ পৰা আগ'ত নথিপত্ৰ"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2919,39 +2915,31 @@ msgstr "পশ্চিমি"
 msgid "Vietnamese"
 msgstr "ভিয়েতনামিছ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "নিৰ্বাচিত পৰিচয়ে নথিপত্ৰসমূহ গ্ৰহণ কৰিব নোৱাৰে।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "নিৰ্বাচিত পৰিচয় অফলাইন।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "কোনো ত্ৰুটি বাৰ্তা নাই"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "তৎক্ষনাত বাৰ্তা (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "প্ৰাৰম্ভে সংযোগ স্থাপন কৰা নহব"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "আৰম্ভণিত পৰিচয় তালিকা বা অন্য কোনো ডাইলগ প্ৰদৰ্শন নকৰিব"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM গ্ৰাহক"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "একাওন্ট ব্যৱস্থাপকৰ সৈতে সংযোগ কৰোতে ত্ৰুটি"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2970,10 +2958,9 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"Empathy এটা বিনামুলিয়া চফ্টওৱেৰ; আপুনি Free Software Foundation -ৰ দ্বাৰা "
-"প্ৰকাশিত GNU General Public License -ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব "
-"অথবা সলনি  কৰিব পাৰিব; হৈতো লাইচেঞ্চৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো "
-"পৰৱৰ্তী সংস্কৰণ।"
+"Empathy এটা বিনামুলিয়া চফ্টওৱেৰ; আপুনি Free Software Foundation ৰ দ্বাৰা প্ৰকাশিত "
+"GNU General Public License ৰ চুক্তিসমূহৰ অন্তৰ্গত ইয়াক পুনৰ বিলাব পাৰিব অথবা সলনি  "
+"কৰিব পাৰিব; হৈতো লাইচেঞ্চৰ সংস্কৰণ ২, অথবা (আপুনাৰ বিকল্পত) যিকোনো পৰৱৰ্তী সংস্কৰণ।"
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2992,237 +2979,97 @@ msgid ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"আপুনি হৈতো ইতিমধ্যে এই প্ৰগ্ৰামৰ সৈতে GNU General Public License -ৰ কপি এটা "
+"আপুনি হৈতো ইতিমধ্যে এই প্ৰগ্ৰামৰ সৈতে GNU General Public License ৰ কপি এটা "
 "পাইছে। যদি নহয়,  Free Software Foundation, Inc., 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-130159 USA -লে লিখক"
+"Floor, Boston, MA 02110-130159 USA লে লিখক"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ৰ সৈতে ব্যৱহাৰযোগ্য তৎক্ষনাত বাৰ্তাকৰণ ক্লাএন্ট"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "অমিতাক্ষ ফুকন (aphukan@fedoraproject.org), নীলমদ্যুতি গোস্বামী (ngoswami@redhat."
 "com)"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "একাওন্টসমূহ ইমপোৰ্ট কৰোতে এটা ত্ৰুটি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "একাওন্ট বিৱৰণসমূহ বিশ্লেষণ কৰোতে এটা ত্ৰুটি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "একাওন্ট সৃষ্টি কৰোতে এটা ত্ৰুটি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "এটা ত্ৰুটি হৈছিল।"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "ত্ৰুটি বাৰ্তা আছিল: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"আপুনি হয় উভতি যাব পাৰে আৰু আপোনাৰ একাওন্ট বিৱৰনসমূহ পুনৰ সোমোৱাৰ চেষ্টা কৰিব পাৰে "
-"অথবা এই সহায়ক প্ৰস্থান কৰক আৰু একাওন্টসমূহ পিছত সম্পাদনা মেনুৰ পৰা যোগ কৰক।"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "এটা ত্ৰুটি দেখা দিছে"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "চেটৰ কি ধৰনৰ একাওন্ট উপস্থিত আছে?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "প্ৰস্তুত কৰাৰ উদ্দেশ্যে অন্য কোনো চেটৰ একাওন্ট উপস্থিত আছে নেকি ?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "আপোনাৰ একাওন্টৰ বিবৰণ ইয়াত লিখক"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "কি ধৰনৰ চেটৰ একাওন্ট আপুনি নিৰ্মাণ কৰিবলৈ ইচ্ছুক ?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "চেটৰ অন্য একাওন্ট নিৰ্মাণ কৰিবলৈ ইচ্ছুক নেকি?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "নতুন একাওন্টৰ বিৱৰণ লিখক"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy -ৰ সৈতে আপুনি কাষৰীয়া মানুহ আৰু বন্ধুসকল আৰু সহকৰ্মীসকল যোনে Google Talk, "
-"AIM, Windows Live আৰু অন্য বহতো চেট প্ৰগ্ৰামসমূহ ব্যৱহাৰ কৰে সিহতৰ লগত অনলাইন চেট "
-"কৰিব পাৰিব। এটা মাক্ৰোফোন অথবা এটা ৱেবকেমৰ সৈতে আপুনি অডিঅ' অথবা ভিডিঅ' কলসমূহ "
-"কৰিব পাৰিব।"
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"অন্য কোনো চেটৰ প্ৰোগ্ৰামৰ সৈতে ব্যৱহৃত হৈছে এনে কোনো একাওন্ট কি বৰ্তমানে উপস্থিত আছে?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "হয়, চিহ্নিত স্থানৰ পৰা মোৰ একাওন্টৰ তথ্য ইমপোৰ্ট কৰা হ'ব "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "হয়, মোৰ একাওন্টৰ তথ্য মই এতিয়ায় লিখিবলৈ ইচ্ছুক"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "নহয়, মই নতুন একাওন্ট প্ৰাপ্ত কৰিবলৈ ইচ্ছুক"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "নহয়, বৰ্তমানে মই অকল ওচৰৰ ব্যক্তিৰ তথ্য চাবলৈ ইচ্ছুক"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "ইমপোৰ্ট কৰাৰ উদ্দেশ্যে একাওন্ট নিৰ্বাচন কৰক:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "হয়"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "নহয়, এতিয়াৰ কাৰণে এইয়াই"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy -এ আপুনি থকা নেটৱাৰ্কত সংযুক্ত থকা মানুহবোৰক স্বচালিতভাৱে খোজ কৰি চেট কৰিব "
-"পাৰে। যদি আপুনি এই বৈশিষ্ট ব্যৱহাৰ কৰিব বিচাৰে, অনুগ্ৰহ কৰি তলত থকা বিৱৰণসমূহ সঠিক "
-"আছে নে নিৰীক্ষণ কৰক। আপুনি সহজতে এই বিৱৰণসমূহ পিছত সলনি কৰিব পাৰিব বা এই বৈশিষ্ট "
-"'Accounts' ডাইলগ ব্যৱহাৰ কৰি অসামৰ্থবান কৰিব পাৰিব"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "সম্পাদনা কৰক -> একাওন্টসমূহ"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "মই এই বৈশিষ্ট এতিয়ায় সামৰ্থবান কৰিব নিবিচাৰো (_n)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"আপুনি আপোনাৰ স্থানীয় নেটৱাৰ্কত সংযুক্ত মানুহবোৰৰ লগত চেট কৰিব নোৱাৰিব কাৰণ, "
-"telepathy-salut ইনস্টল নাই। যদি আপুনি এই বৈশিষ্ট সামৰ্থবান কৰিব বিচাৰে, অনুগ্ৰহ "
-"কৰি telepathy-salut পেকেইজ ইনস্টল কৰক আৰএ একাওন্টসমূহ ডাইলগৰ পৰা এটা কাষৰীয়া "
-"মানুহবোৰ একাওন্ট সৃষ্টি কৰক"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ইনস্টল নাই"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "বাৰ্তা আৰু VoIP একাওন্টসমূহ সহায়ক"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Empathy লৈ স্বাগতম"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "আপোনাৰ উপস্থিত একাওন্ট ইমপোৰ্ট কৰক"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "অনুগ্ৰহ কৰি ব্যক্তিগত বিৱৰণসমূহ সোমাওক"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "আপোনাৰ %s একাওন্টত অসংৰক্ষীত পৰিৱৰ্তনসমূহ আছে।"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "আপোনাৰ নতুন একাওন্ট এতিয়াও সংৰক্ষণ কৰা হোৱা নাই"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "সংযোগ কৰা হৈ আছে…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "অফলাইন— %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "বিচ্ছিন্নিত — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "অফলাইন — কোনো নেটৱাৰ্ক সংযোগ নাই"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "অজ্ঞাত অৱস্থা"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"এই একাওন্ট অসামৰ্থবান কৰা হৈছে কাৰণ ই এটা পুৰনি, অসমৰ্থিত বেকএণ্ডৰ উপৰত নিৰ্ভৰশীল। "
+"আপোনাৰ একাওন্ট প্ৰব্ৰজন কৰিবলে অনুগ্ৰহ কৰি telepathy-haze ইনস্টল কৰক আৰু আপোনাৰ "
+"অধিবেশন পুনৰাম্ভ কৰক।"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "অফলাইন — একাওন্ট অসামৰ্থবান"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"আপুনি এটা নতুন একাওন্ট সৃষ্টি কৰিব লৈছে, যাৰ ফলত আপোনাৰ পৰিৱৰ্তনসমূহ\n"
-"আতৰোৱা হব। আপুনি নিশ্চিত নে আপুনি আগবাঢ়িব বিচাৰে?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "সংযোগ প্ৰাচলসমূহ সম্পাদন কৰক"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "চাৰ্ভাৰৰ পৰা আপোনাৰ ব্যক্তিগত তথ্য উদ্ধাৰ কৰিবলে ব্যৰ্থ।"
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "আপোনাৰ ব্যক্তিগত তথ্য সম্পাদন কৰিবলে অনলাইন যাওক।"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "সংযোগ প্ৰাচলসমূহ সম্পাদন কৰক (_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
-msgstr "আপুনি %s -ক আপোনাৰ কমপিউটাৰৰ পৰা আতৰাব বিচাৰে নে?"
+msgstr "আপুনি %s ক আপোনাৰ কমপিউটাৰৰ পৰা আতৰাব বিচাৰে নে?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "ই চাৰ্ভাৰত আপোনাৰ একাওন্টক আতৰাই নিদিয়ে।"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3231,15 +3078,23 @@ msgstr ""
 "আতৰোৱা হব। আপুনি নিশ্চিত নে আপুনি আগবাঢ়িব বিচাৰে?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "সামৰ্থবান কৰক (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "অসামৰ্থবান কৰক (_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "বাদ দিয়ক (_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "সংযোগ কৰক (_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3251,19 +3106,15 @@ msgstr ""
 msgid "Add…"
 msgstr "যোগ কৰক…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "একাওন্ট তথ্য ল'ড কৰা হৈ আছে"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "কোনো প্ৰটোকল সংস্থাপন কৰা নহয়"
+msgid "_Import…"
+msgstr "ইমপোৰ্ট কৰক (_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "প্ৰটোকল:"
+msgid "Loading account information"
+msgstr "একাওন্ট তথ্য ল'ড কৰা হৈ আছে"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3271,148 +3122,132 @@ msgstr ""
 "নতুন একাওন্ট যোগ কৰাৰ বাবে, প্ৰথমে ব্যৱহাৰযোগ্য প্ৰতি প্ৰটোকলৰ বাবে এটা বেক লৈন্ড "
 "সংস্থাপন কৰা আৱশ্যক।"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "ইমপোৰ্ট কৰক (_I)..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "কোনো প্ৰটোকল বেকএণ্ড ইনস্টল নাই"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Empathy প্ৰমাণীকৰণ ক্লাএন্ট"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy প্ৰমাণীকৰণ ক্লাএন্ট"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "ওচৰৰ ব্যক্তিৰ"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy অডিঅ'/ভিডিঅ' ক্লাএন্ট"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy অডিঅ'/ভিডিঅ' ক্লাএন্ট"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "বৈপৰিত্য"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "উজ্জ্বলতা"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "গামা"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "ধ্বনি"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "কাষ-বাৰ (_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "অডিঅ' ইনপুট"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "ভিডিঅ' ইনপুট"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "ডায়েল-পেড"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "বিৱৰণসমূহ"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "%s ৰ সৈতে কল"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "মেচিনে দেখা দৰে IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ইন্টাৰনেটত এটা চাৰ্ভাৰে দেখা দৰে IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "অন্য কাষে দেখা ধৰণে সমনীয়াৰ IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "এটা প্ৰেৰণ চাৰ্ভাৰৰ IP ঠিকনা"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "মাল্টিকাস্ট দলৰ IP ঠিকনা"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "অজ্ঞাত"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "অজ্ঞাত"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "অজ্ঞাত"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "সংযোগেৰ অবকাল — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "কাৰিকৰী বিৱৰণসমূহ"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr "%s -ৰ চফ্টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ্থন কৰা কোনো অডিঅ' বিন্যাস বুজি নাপায়"
+msgstr "%s ৰ চফ্টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ্থন কৰা কোনো অডিঅ' বিন্যাস বুজি নাপায়"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr "%s -ৰ চফ্টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ্থন কৰা কোনো ভিডিঅ' বিন্যাস বুজি নাপায়"
+msgstr "%s ৰ চফ্টৱেৰে আপোনাৰ কমপিউটাৰে সমৰ্থন কৰা কোনো ভিডিঅ' বিন্যাস বুজি নাপায়"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3421,25 +3256,23 @@ msgstr ""
 "%s লে এটা সংযোগ স্থাপন কৰিব নোৱাৰে। আপোনা লোকৰ এজন হয়তো এনে নেটৱাৰ্কত আছে যি "
 "প্ৰত্যক্ষ সংযোগসমূহৰ অনুমতি নিদিয়ে।"
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "নেটৱাৰ্কত এটা ব্যৰ্থতা হৈছিল"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
+msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "এই কলৰ বাবে প্ৰয়োজনীয় অডিঅ' বিন্যাসসমূহ আপোনাৰ কমপিউটাৰত ইনস্টল নাই"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
+msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "এই কলৰ বাবে ভিডিঅ' বিন্যাসসমূহ আপোনাৰ কমপিউটাৰত ইনস্টল নাই"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3449,262 +3282,309 @@ msgstr ""
 "কিবা অপ্ৰত্যাশিত এটা Telepathy উপাদানত ঘটিছে। অনুগ্ৰহ কৰি <a href=\"%s\">এই বাগ "
 "সংবাদন কৰক</a> আৰু সহায় মেনুৰ 'ডিবাগ' উইন্ডোৰ পৰা সংগ্ৰহ কৰা লগসমূহ এটাচ কৰক।"
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "কল ইঞ্জীনত এটা ব্যৰ্থতা হৈছিল"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "স্ট্ৰিমৰ অন্ত পোৱা গল"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "অডিঅ' স্ট্ৰিম স্থাপনা কৰিব নোৱাৰি"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "ভিডিঅ' স্ট্ৰিম স্থাপনা কৰিব নোৱাৰি"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "অডিঅ'"
+msgid "_Call"
+msgstr "কল (_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "কডেক ডিক'ড কৰা হৈ আছে:"
+msgid "_Microphone"
+msgstr "মাক্ৰোফোন (_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "কেমেৰা অসামৰ্থবান কৰক"
+msgid "_Camera"
+msgstr "কেমেৰা (_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "ডায়েলপেড প্ৰদৰ্শন কৰক"
+msgid "_Settings"
+msgstr "সংহতিসমূহ (_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "কডেক এনক'ড কৰা হৈ আছে:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "প্ৰদৰ্শন (_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "বিচ্ছিন্ন কৰক"
+#: ../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 "সহায় (_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "বৰ্তমান কল হেঙআপ কৰক"
+#: ../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 "সূচী (_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "স্থানীয় প্ৰাৰ্থী:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "ডিবাগ কৰক (_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "মোক ডাঙৰ কৰক"
+msgid "Swap camera"
+msgstr "কেমেৰা স্বাপ কৰক"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "মোক সৰু কৰক"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "দূৰৱৰ্তী প্ৰাৰ্থী:"
+msgid "Maximise me"
+msgstr "মোক ডাঙৰ কৰক"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "অডিঅ' পঠিয়াওক"
+msgid "Disable camera"
+msgstr "কেমেৰা অসামৰ্থবান কৰক"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "ভিডিঅ' পঠাওক"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "বিচ্ছিন্ন কৰক"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "ডায়েলপেড দেখুৱাওক"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "বৰ্তমান কল হেঙআপ কৰক"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "ভিডিঅ' কল "
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "এটা ভিডিঅ' কল আৰম্ভ কৰক"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "এটা অডিঅ' কল আৰম্ভ কৰক"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "কেমেৰা স্বাপ কৰক"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "অডিঅ' সৰবৰাহ অদল বদল কৰক"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "ভিডিঅ' সৰবৰাহ অদল বদল কৰক"
+msgid "Show dialpad"
+msgstr "ডায়েলপেড দেখুৱাওক"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "অজ্ঞাত"
+msgid "Display the dialpad"
+msgstr "ডায়েলপেড প্ৰদৰ্শন কৰক"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "ভিডিঅ' পঠাওক"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "ভিডিঅ' কল "
+msgid "Toggle video transmission"
+msgstr "ভিডিঅ' সৰবৰাহ অদল বদল কৰক"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "কল (_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "অডিঅ' পঠিয়াওক"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "কেমেৰা (_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "সূচী (_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "অডিঅ' সৰবৰাহ অদল বদল কৰক"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "ডিবাগ কৰক (_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "কডেক এনক'ড কৰা হৈ আছে:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "সহায় (_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "অজ্ঞাত"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "কডেক ডিক'ড কৰা হৈ আছে:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "মাক্ৰোফোন (_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "দূৰৱৰ্তী প্ৰাৰ্থী:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "সংহতিসমূহ (_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "স্থানীয় প্ৰাৰ্থী:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "প্ৰদৰ্শন (_V)"
+msgid "Audio"
+msgstr "অডিঅ'"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "এই উইন্ডো বন্ধ কৰিব নে?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"এই উইন্ডো বন্ধ কৰিলে %s অৱশিষ্ট থাকিব। আপুনি ইয়াক পুনৰ অংশগ্ৰহণ নকৰিলে ততোধিক "
+"বাৰ্তাসমূহ নাপাব।"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"এই উইন্ডো বন্ধ কৰিলে এটা চেট ৰুম বাদ দিয়া হব। আপুনি ইয়াক পুনৰ অংশগ্ৰহণ নকৰা লৈকে "
+"কোনো ততোধিক বাৰ্তা নাপাব।"
+msgstr[1] ""
+"এই উইন্ডো বন্ধ কৰিলে %u চেট ৰুমসমূহ বাদ দিয়া হব। আপুনি ইহতক পুনৰ অংশগ্ৰহণ নকৰা লৈকে "
+"কোনো ততোধিক বাৰ্তা নাপাব।"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "%s এৰিব নে?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "আপুনি এই চেট ৰুম পুনৰঅংশগ্ৰহণ নকৰালৈকে কোনো ততোধিক বাৰ্তা নাপাব।"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "উইন্ডো বন্ধ কৰক"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "ৰুম এৰি দিওক"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d পঢ়া হোৱা নাই)"
 msgstr[1] "%s (%d পঢ়া হোৱা নাই)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (আৰু %u অন্য)"
 msgstr[1] "%s (আৰু %u অন্য)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d অন্যৰ পৰা পঢ়া হোৱা নাই)"
 msgstr[1] "%s (%d অন্যৰ পৰা পঢ়া হোৱা নাই)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d সকলোৰ পৰা পঢ়া হোৱা নাই)"
 msgstr[1] "%s (%d সকলোৰ পৰা পঢ়া হোৱা নাই)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d বাৰ্তা পঠোৱা হৈ আছে"
 msgstr[1] "%d বাৰ্তাসমূহ পঠোৱা হৈ আছে"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "বাৰ্তা লিখা হৈছে।"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "আঁতৰাওক (_l)"
+msgid "_Conversation"
+msgstr "কথোপকথন (_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "পৰিচয় (_o)"
+msgid "C_lear"
+msgstr "আঁতৰাওক (_l)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "স্মাইলি যোগ কৰক (_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "জনপ্ৰিয় চেট ৰুম (_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "প্ৰতিযোগীক আমন্ত্ৰণ দিয়ক (_P)…"
+msgid "Notify for All Messages"
+msgstr "সকলো বাৰ্তাৰ বাবে অধিসূচনা দিয়ক"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "টেব বাওঁফালে নিয়ক (_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "পৰিচিত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰা হ'ব (_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "টেব সোঁফালে নিয়ক (_R)"
+msgid "Invite _Participant…"
+msgstr "প্ৰতিযোগীক আমন্ত্ৰণ দিয়ক (_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "সকলো বাৰ্তাৰ বাবে অধিসূচনা দিয়ক"
+msgid "C_ontact"
+msgstr "পৰিচয় (_o)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "কথোপকথন (_C)"
+msgid "_Tabs"
+msgstr "টেব (_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "টেব বিচ্ছিন্ন কৰক (_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "জনপ্ৰিয় চেট ৰুম (_F)"
+msgid "_Previous Tab"
+msgstr "পূৰ্ববৰ্তী টেব (_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "পৰবৰ্তী টেব (_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "পূৰ্ববৰ্তী টেব (_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "টেব বন্ধ বাতিল কৰক (_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "পৰিচিত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰা হ'ব (_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "টেব বাওঁফালে নিয়ক (_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "টেব (_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "টেব সোঁফালে নিয়ক (_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "টেব বন্ধ বাতিল কৰক (_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "টেব বিচ্ছিন্ন কৰক (_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3718,100 +3598,100 @@ msgstr "ৰুম"
 msgid "Auto-Connect"
 msgstr "স্বয়ংক্ৰিয়-সংযোগ"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "পছন্দৰ ৰুম পৰিচয়লনা কৰক"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "আগ'ত ভিডিঅ' কল"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "আগমনকৰ্তা কল"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s -এ আপোনাক ভিডিঅ' কল কৰি আছে। আপুনি উত্তৰ দিব বিচাৰে নে?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s -এ আপোনাক কল কৰি আছে। আপুনি উত্তৰ দিব বিচাৰে নে?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "%sৰ পৰা আগমনকৰ্তা কল"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "প্ৰত্যাখ্যান কৰক (_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "উত্তৰ দিয়ক (_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "ভিডিঅ'ৰ সৈতে উত্তৰ দিয়ক (_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "%s -ৰ পৰা আগ'ত ভিডিঅ' কল"
+msgstr "%s ৰ পৰা আগ'ত ভিডিঅ' কল"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "ৰুমৰ আমন্ত্ৰণ"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
-msgstr "%s -ত যোগদান দিবলে আমন্ত্ৰণ"
+msgstr "%s ত যোগদান দিবলে আমন্ত্ৰণ"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s এ আপোনাক %s লৈ আমন্ত্ৰণ জনাইছে"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "প্ৰত্যাখ্যান কৰক (_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "যোগ কৰক (_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s এ আপোনাক %s লৈ আমন্ত্ৰণ জনাইছে"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "আপোনাক %s -ত যোগদান দিবলে আমন্ত্ৰণ জনোৱা হৈছে"
+msgstr "আপোনাক %s ত যোগদান দিবলে আমন্ত্ৰণ জনোৱা হৈছে"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s দ্বাৰা প্ৰৰিত নথিপত্ৰ আগত"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "পাছৱাৰ্ডৰ প্ৰয়োজন"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "আপুনি কেতিয়া অনলাইন আছে চাবলে %s -এ অনুমতি বিচাৰিব"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3821,105 +3701,105 @@ msgstr ""
 "বাৰ্তা: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "অজ্ঞাত"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s, %s ৰ %s/s ত"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s, মুঠ %s ৰ"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" প্ৰাপ্ত কৰা হৈছে, %sৰ পৰা"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" পঠিওৱা হৈছে, %s ক"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" প্ৰাপ্ত কৰিবলৈ সমস্যা, %sৰ পৰা আগত"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "নথিপত্ৰ প্ৰাপ্ত কৰিবলৈ সমস্যা"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" ক %s লৈ পঠিয়াবলৈ ব্যৰ্থ"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "নথিপত্ৰ পঠিয়াবলৈ সমস্যা"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" প্ৰাপ্ত হৈছে, %sৰ পৰা"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" প্ৰৰিত হৈছে, %s ক"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "নথিপত্ৰ স্থানান্তৰ সম্পূৰ্ণ হৈছে"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "অন্য ব্যৱহাৰকাৰীৰ প্ৰতিক্ৰিয়াৰ অপেক্ষা কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" ৰ অখণ্ডতা পৰীক্ষা কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\" হেশ্ব কৰা হৈছে"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "নথিপত্ৰ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "অবশিষ্ট"
 
@@ -3931,179 +3811,209 @@ msgstr "নথিপত্ৰ স্থানান্তৰ"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "সমাপ্ত, বাতিল আৰু বিফল নথিপত্ৰ স্থানান্তৰৰ তথ্য এই তালিকাৰ পৰা আঁতৰুৱা হ'ব"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "ইমপোৰ্ট কৰক (_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"ইমপোৰ্ট কৰিবলে কোনো একাওন্ট পোৱা নগল। Empathy -এ বৰ্তমানে কেৱল Pidgin -ৰ পৰা "
+"ইমপোৰ্ট কৰিবলে কোনো একাওন্ট পোৱা নগল। Empathy -এ বৰ্তমানে কেৱল Pidgin ৰ পৰা "
 "একাওন্টসমূহ ইমপোৰ্ট কৰা সমৰ্থন কৰে।"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "একাওন্ট ইমপোৰ্ট কৰক"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "ইমপোৰ্ট"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "প্ৰটোকল"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "উৎস"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "পাছৱাৰ্ড প্ৰদান কৰক"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "বিচ্ছিন্ন কৰক"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "আপুনি ইয়াত পৰিচয়সমূহ চাবলে এটা একাওন্ট সংস্থাপন কৰিব লাগিব।"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "কোনো মিল পোৱা নগল"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"ক্ষমা কৰিব, %s একাওন্টসমূহ ব্যৱহাৰ কৰিব নোৱাৰি যেতিয়ালৈকে %s চফ্টৱেৰ ব্যৱহাৰ কৰা "
+"নহয়।"
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "চফ্টৱেৰ আপডেইট কৰক..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "বন্ধ কৰক"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "পুনৰ সংযোগ কৰক"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "একাওন্ট সম্পাদন কৰক"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "বন্ধ কৰক"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "টপ আপ %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "টপ আপ একাওন্ট দেনা"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "টপ আপ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "পৰিচিত ব্যক্তি"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "আপুনি পৰিচয়সমূহ ইয়াত চাবলে আপোনাৰ একাওন্টসমূহৰ এটা সামৰ্থবান কৰিব লাগিব।"
+
+#. 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 "আপুনি পৰিচয়সমূহ ইয়াত চাবলে %s সামৰ্থবান কৰিব লাগিব।"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "পৰিচিত ব্যক্তিৰ তালিকা"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "মানচিত্ৰত পৰিচয়ৰ তথ্য (_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "একাওন্ট সংহতিসমূহ"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "দেনা অৱশিষ্ট"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "নতুন কথোপকথন (_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "পৰিচয় তালিকাত সন্ধান কৰক (_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "নতুন কল (_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "জনপ্ৰিয়সমূহত যোগ দিন (_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "পৰিচয়সমূহৰ বাবে সন্ধান কৰক (_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "জনপ্ৰিয় মান পৰিচয়লনা"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "নথিপত্ৰ স্থানান্তৰসমূহ (_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "স্বাভাবিক মাপ (_o)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "অফ-লাইন পৰিচয় (_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "নতুন কল (_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "প্ৰটোকলসমূহ দেখুৱাওক"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "অৱতাৰ সহযোগে স্বাভাবিক মাপ (_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "দেনা অৱশিষ্ট"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "মানচিত্ৰত পৰিচয়ৰ তথ্য (_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "একাওন্টসমূহ (_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "প্ৰতিৰোধিত পৰিচয়সমূহ (_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "পছন্দসমূহ (_r)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "প্ৰটোকলসমূহ দেখুৱাওক"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "পৰিচয় তালিকাত সন্ধান কৰক (_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "নাম অনুযায়ী সজাওক (_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "অৱস্থা অনুযায়ী সজাওক (_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "একাওন্টসমূহ (_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "অৱতাৰ সহযোগে স্বাভাবিক মাপ (_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "প্ৰতিৰোধিত পৰিচয়সমূহ (_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "স্বাভাবিক মাপ (_o)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "সংকুচিত মাপ (_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "নথিপত্ৰ স্থানান্তৰসমূহ (_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "ৰুম (_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "যোগদান কৰক (_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "নতুন কথোপকথন (_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "অফ-লাইন পৰিচয় (_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "ব্যক্তিগত তথ্য (_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "ৰুম (_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "জনপ্ৰিয়সমূহত যোগ দিন (_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "পৰিচয়সমূহৰ বাবে সন্ধান কৰক (_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "জনপ্ৰিয় মান পৰিচয়লনা"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "চেট ৰুম"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "সদস্যবৃন্দ"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4116,31 +4026,39 @@ msgstr ""
 "পাছৱাৰ্ডৰ প্ৰয়োজন: %s\n"
 "সদস্যসমূহ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "হয়"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "নহয়"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ৰুমৰ তালিকা নিৰ্মাণ কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ৰুমৰ তালিকা নিৰ্মাণ বন্ধ কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ৰুমৰ তালিকা ল'ড কৰিবলৈ ব্যৰ্থ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ৰুমত যোগ দিয়ক"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "ইয়াত যোগদান কৰিবলে ৰুমৰ নাম সোমাওক অথবা তালিকাত থকা এটা বা অধিক ৰুমসমূহত ক্লিক "
 "কৰক।"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ৰুম: (_R)"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4148,504 +4066,822 @@ msgstr ""
 "ৰুমক হস্ট কৰা চাৰ্ভাৰ সোমাওক, অথবা ইয়াক ৰিক্ত এৰক যদি ৰুম বৰ্তমান একাওন্টৰ চাৰ্ভাৰত "
 "আছে"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ৰুমত যোগ দিয়ক"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ৰুমৰ তালিকা ল'ড কৰিবলৈ ব্যৰ্থ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ৰুমৰ তালিকা"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ৰুম: (_R)"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "প্ৰাপ্ত বাৰ্তা"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "বাৰ্তা পঠিওৱা হৈছে"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "নতুন কথোপকথন"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "পৰিচয় অন-লাইন আহিছে"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "পৰিচয় অন-লাইন আহে"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "পৰিচয় অফ-লাইন হৈছে"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "একাওন্ট সংযুক্ত কৰা হৈছে"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "একাওন্টৰ সৈতে সংযোগ বিচ্ছিন্ন কৰা হৈছে"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "ভাষা"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "জুলিয়েট"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ৰোমিও"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "অ ৰোমিও, ৰোমিও, তুমি ক'ত আছা ৰোমিও?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "তোমাৰ দেউতাক অস্বীকাৰ কৰা আৰু তোমাৰ নামক মানি নলবা;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "অথবা যদি এনে নকৰা, মোৰ প্ৰেমৰ প্ৰতিজ্ঞা লোৱা"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "আৰু মই আৰু Capulet হৈ নাথাকিম।"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "মই আৰু শুনিম, নে ইয়াত কিবা কম?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "জুলিয়েট -এ সংযোগ বিচ্ছিন্নিত কৰিছে"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "পছন্দ"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "ছবি ৰূপে স্মাইলি প্ৰদৰ্শন কৰা হ'ব (_s)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "ৰুমত পৰিচিত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰা হ'ব (_l)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "চেহেৰা ছবি"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "আচৰণ"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "চেট আৰম্ভ কৰিব:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "চেটৰ থীম: (_e)"
+msgid "new ta_bs"
+msgstr "নতুন টেবসমূহ (_b)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "অনুপস্থিত অথবা ব্যস্ত থাকিলে সূচনাপ্ৰদানৰ ব্যৱস্থা নিষ্ক্ৰিয় কৰা হ'ব (_a)"
+msgid "new _windows"
+msgstr "নতুন উইন্ডোসমূহ (_w)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "অনুপস্থিত অথবা ব্যস্ত থাকিলে শব্দ নিষ্ক্ৰিয় কৰা হ'ব (_a)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "আগ'ত ঘটনাসমূহক অধিসূচনা স্থানত প্ৰদৰ্শন কৰক"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "আৰম্ভত স্বচালিতভাৱে সংযোগ কৰক (_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"প্ৰতিধ্বনি বাতিল কৰায় আপোনাৰ কন্ঠক অন্য ব্যক্তিয়ে স্পষ্ট শুনিবলে সহায় কৰে, কিন্তু "
-"কিছুমান কমপিউটাৰত সমস্যা সৃষ্টি কৰিব পাৰে। যদি আপুনি অথবা অন্য মানুহজনে কলৰ সমূয়ত "
-"অদ্ভুত শব্দ বা খেৰখেৰনি শুনে, প্ৰতিধ্বনি বাতিল কৰা বন্ধ কৰি কল পুনৰাম্ভ কৰি চাওক।"
+msgid "Log conversations"
+msgstr "লগ কথোপকথনসমূহ"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "পৰিচিত ব্যক্তি অন-লাইন আহিলে সূচনাপ্ৰদানৰ ব্যৱস্থা সামৰ্থবান কৰক"
+msgid "Behavior"
+msgstr "আচৰণ"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "পৰিচিত ব্যক্তি অফ-লাইন হ'লে সূচনাপ্ৰদানৰ ব্যৱস্থা সামৰ্থবান কৰক"
+msgid "General"
+msgstr "সাধাৰণ"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "চেট মনোনিবেশিত নথকাত অধিসূচনাসমূহ সামৰ্থবান কৰক (_c)"
+msgid "_Enable bubble notifications"
+msgstr "বাবল দ্বাৰা সূচনাপ্ৰদান সামৰ্থবান কৰক (_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "চিহ্নিত ভাষাসমূহৰ বাবে বানান পৰীক্ষণ সামৰ্থবান কৰক:"
+msgid "Disable notifications when _away or busy"
+msgstr "অনুপস্থিত অথবা ব্যস্ত থাকিলে সূচনাপ্ৰদানৰ ব্যৱস্থা নিষ্ক্ৰিয় কৰা হ'ব (_a)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "সাধাৰণ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "চেট মনোনিবেশিত নথকাত অধিসূচনাসমূহ সামৰ্থবান কৰক (_c)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "ইনপুট স্তৰ:"
+msgid "Enable notifications when a contact comes online"
+msgstr "পৰিচিত ব্যক্তি অন-লাইন আহিলে সূচনাপ্ৰদানৰ ব্যৱস্থা সামৰ্থবান কৰক"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "ইনপুট ভলিউম:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "পৰিচিত ব্যক্তি অফ-লাইন হ'লে সূচনাপ্ৰদানৰ ব্যৱস্থা সামৰ্থবান কৰক"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "সূচনাবাৰ্তা"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "অৱস্থান উৎসসমূহ:"
+msgid "_Enable sound notifications"
+msgstr "শব্দ দ্বাৰা সূচনাপ্ৰদান সামৰ্থবান কৰক (_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "লগ কথোপকথনসমূহ"
+msgid "Disable sounds when _away or busy"
+msgstr "অনুপস্থিত অথবা ব্যস্ত থাকিলে শব্দ নিষ্ক্ৰিয় কৰা হ'ব (_a)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "সূচনাবাৰ্তা"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "বিভিন্ন ঘটনাৰ বাবে শব্দ বজাওক"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "শব্দ"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "গোপনীয়তা"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "কলৰ গুণ উন্নত কৰিবলে প্ৰতিধ্বনি বাতিল ব্যৱহাৰ কৰক (_e)"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"কমোৱা অৱস্থান সঠিকতায় বুজায় যে আপোনাৰ শহৰ, ৰাজ্য আৰু দেশৰ বাহিৰে আৰু একো প্ৰকাশ "
-"কৰা নহব। GPS অক্ষসমূহ ই দশমিক লৈকে সঠিক হব।"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "ছবি ৰূপে স্মাইলি প্ৰদৰ্শন কৰা হ'ব (_s)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "ৰুমত পৰিচিত ব্যক্তিৰ তালিকা প্ৰদৰ্শন কৰা হ'ব (_l)"
+"প্ৰতিধ্বনি বাতিল কৰায় আপোনাৰ কন্ঠক অন্য ব্যক্তিয়ে স্পষ্ট শুনিবলে সহায় কৰে, কিন্তু "
+"কিছুমান কমপিউটাৰত সমস্যা সৃষ্টি কৰিব পাৰে। যদি আপুনি অথবা অন্য মানুহজনে কলৰ সমূয়ত "
+"অদ্ভুত শব্দ বা খেৰখেৰনি শুনে, প্ৰতিধ্বনি বাতিল কৰা বন্ধ কৰি কল পুনৰাম্ভ কৰি চাওক।"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "শব্দ"
+msgid "_Publish location to my contacts"
+msgstr "পৰিচিত ব্যক্তিৰ অৱস্থান প্ৰকাশ কৰা হ'ব (_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "বানান পৰীক্ষণ"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"ভাষাসমূহৰ তালিকায় কেৱল সেই ভাষাসমূহ যাৰ বাবে আপোনাৰ এটা শব্দকোষ ইনস্টল আছে "
-"সেইসমূহ প্ৰতিফলন কৰে।"
+"কমোৱা অৱস্থান সঠিকতায় বুজায় যে আপোনাৰ শহৰ, ৰাজ্য আৰু দেশৰ বাহিৰে আৰু একো প্ৰকাশ "
+"কৰা নহব। GPS অক্ষসমূহ ই দশমিক লৈকে সঠিক হব।"
 
+#. 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 "Themes"
-msgstr "থীমসমূহ"
+msgid "_Reduce location accuracy"
+msgstr "অৱস্থান সঠিকতা কম কৰক (_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "অপৰ:"
+msgid "Privacy"
+msgstr "গোপনীয়তা"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "আৰম্ভত স্বচালিতভাৱে সংযোগ কৰক (_A)"
+msgid "_GPS"
+msgstr "GPS (_G)"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "চেলফোন (_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "বাবল দ্বাৰা সূচনাপ্ৰদান সামৰ্থবান কৰক (_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "নেটৱাৰ্ক (IP, Wi-Fi) (_N)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "শব্দ দ্বাৰা সূচনাপ্ৰদান সামৰ্থবান কৰক (_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "GPS (_G)"
+msgid "Location sources:"
+msgstr "অৱস্থান উৎসসমূহ:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "নেটৱাৰ্ক (IP, Wi-Fi) (_N)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"ভাষাসমূহৰ তালিকায় কেৱল সেই ভাষাসমূহ যাৰ বাবে আপোনাৰ এটা শব্দকোষ ইনস্টল আছে "
+"সেইসমূহ প্ৰতিফলন কৰে।"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "নতুন চেটসমূহ পৃথক উইন্ডোত খোলা হ'ব (_O)"
+msgid "Enable spell checking for languages:"
+msgstr "চিহ্নিত ভাষাসমূহৰ বাবে বানান পৰীক্ষণ সামৰ্থবান কৰক:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "পৰিচিত ব্যক্তিৰ অৱস্থান প্ৰকাশ কৰা হ'ব (_P)"
+msgid "Spell Checking"
+msgstr "বানান পৰীক্ষণ"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "চেটৰ থীম: (_e)"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "অৱস্থান সঠিকতা কম কৰক (_R)"
+msgid "Variant:"
+msgstr "অপৰ:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "থীমসমূহ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "অৱস্থা"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "প্ৰস্থান (_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "পৰিচয়ক আকো কল কৰক"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "কেমেৰা বন্ধ কৰক"
+msgid "Redial"
+msgstr "পুনঃ ডায়েল কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "কেমেৰা অন কৰক"
+msgid "V_ideo"
+msgstr "ভিডিঅ' (_i)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "ভিডিঅ' বন্ধ কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "কেমেৰা অসামৰ্থবান কৰক আৰু ভিডিঅ' পঠোৱা বন্ধ কৰক"
+msgid "Video Preview"
+msgstr "ভিডিঅ' পূৰ্বদৰ্শন কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "কেমেৰা সামৰ্থবান কৰক আৰু ভিডিঅ' পঠাওক"
+msgid "Video On"
+msgstr "ভিডিঅ' অন কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "কেমেৰা সামৰ্থবান কৰক কিন্তু ভিডিঅ' নপঠাব"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "পৰিচয়ক আকো কল কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "পূৰ্বদৰ্শন কৰক"
+msgid "Camera Off"
+msgstr "কেমেৰা বন্ধ কৰক"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "পুনঃ ডায়েল কৰক"
+msgid "Disable camera and stop sending video"
+msgstr "কেমেৰা অসামৰ্থবান কৰক আৰু ভিডিঅ' পঠোৱা বন্ধ কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "ভিডিঅ' (_i)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "পূৰ্বদৰ্শন কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "ভিডিঅ' বন্ধ কৰক"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "কেমেৰা সামৰ্থবান কৰক কিন্তু ভিডিঅ' নপঠাব"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "ভিডিঅ' অন কৰক"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "কেমেৰা অন কৰক"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ভিডিঅ' পূৰ্বদৰ্শন কৰক"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "কেমেৰা সামৰ্থবান কৰক আৰু ভিডিঅ' পঠাওক"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Map View ৰ সৈতে সংযোগ স্থাপন কৰক"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "সংৰক্ষণ"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "পেইস্টবিন সংযোগ"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "পেইস্টবিন প্ৰতিক্ৰিয়া"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "তথ্য এটা পেইস্টৰ বাবে অতি ডাঙৰ। অনুগ্ৰহ কৰি লগসমূহ নথিপত্ৰত সংৰক্ষণ কৰক।"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "ডিবাগ উইন্ডো"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "পেইস্টবিনলে পঠাওক"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "স্থগিত কৰক"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "স্তৰ "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "ডিবাগ"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "তথ্য"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "বাৰ্তা"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "সতৰ্কবাৰ্তা"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "গুৰুত্বপূৰ্ণ"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "ত্ৰুটি"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "সময়"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "ডোমেইন"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "শ্ৰেণী"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "স্তৰ"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "নিৰ্বাচিত সংযোগ ব্যৱস্থাপকে দূৰৱৰ্তী ডিবাগিং সম্প্ৰসাৰন সমৰ্থন নকৰে।"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "অংশগ্ৰহণকাৰীক আমন্ত্ৰণ জনাওক"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "কথোপকথনলে আমন্ত্ৰণ জনাবলে এটা পৰিচয় বাছক"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "আমন্ত্ৰণ জনাওক"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "কোনো ডাইলগ প্ৰদৰ্শন নকৰিব; যিকোনো কাম কৰক (উদাহৰনস্বৰূপ, ইমপোৰ্ট কৰা) আৰু প্ৰস্থান "
 "কৰক"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "কোনো ডাইলগ প্ৰদৰ্শন নকৰিব যেতিয়ালৈকে সিহত \"কাষৰীয়া মানুহ\"একাওন্টসমূহ নহয়"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "আৰম্ভণিত প্ৰদান কৰা একাওন্ট (উদাহৰনস্বৰূপ, gabble/jabber/foo_40example_2eorg0) "
 "নিৰ্বাচন কৰক"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy একাওন্টসমূহ"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy একাওন্টসমূহ"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "এটা বিশেষ সেৱা দেখুৱাওক"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy ডিবাগাৰ"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy ডিবাগাৰ"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy চেট ক্লাএন্ট"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "প্ৰতিক্ৰিয়া"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "নাকচ কৰক"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "উত্তৰ"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "ভিডিঅ'ৰ সৈতে উত্তৰ দিয়ক"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "নাকচ কৰক"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "গ্ৰহন কৰক"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "প্ৰদান কৰক"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s - এইমাত্ৰ আপোনাক কল কৰাৰ চেষ্টা কৰিছিল, কিন্তু আপুনি অন্য এটা কলত আছিল।"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "হল্ডত আছে"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "মিউট"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "অবধি"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "আপোনাৰ বৰ্তমান বেলেঞ্চ হল %s।"
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "ক্ষমা কৰিব, আপোনাৰ সেই কলৰ বাবে পৰ্যাপ্ত দেন নাই।"
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "টপ আপ"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "ফলা মিলাওক (_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "চেটৰ কি ধৰনৰ একাওন্ট উপস্থিত আছে?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "নতুন একাওন্ট যোগ কৰা"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "ওচৰৰ ব্যক্তিৰ"
+
+#: ../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."
+msgstr ""
+"Empathy -এ আপুনি থকা নেটৱাৰ্কত সংযুক্ত থকা মানুহবোৰক স্বচালিতভাৱে খোজ কৰি চেট কৰিব "
+"পাৰে। যদি আপুনি এই বৈশিষ্ট ব্যৱহাৰ কৰিব বিচাৰে, অনুগ্ৰহ কৰি তলত থকা বিৱৰণসমূহ সঠিক "
+"আছে নে নীৰিক্ষণ কৰক।"
+
+#: ../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 ""
+"আপুনি এই বিৱৰণসমূহ পিছত সলনি অথবা এই বৈশিষ্ট অসামৰ্থবান কৰিব পাৰিব পৰিচয় তালিকাত "
+"<span style=\"italic\">সম্পাদন → একাওন্টসমূহ</span> নিৰ্বাচন কৰি।"
+
+#~ msgid "Call volume"
+#~ msgstr "কল ভলিউম"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "কল ভলিউম, এটা শতাংশ হিচাপে।"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy -এ বাটাৰফ্লাই লগসমূহ প্ৰব্ৰজন কৰিছে"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy -এ বাটাফ্লাই লগসমূহ প্ৰব্ৰজন কৰিছে নে।"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "ছ'কেটৰ ধৰন সমৰ্থিত নহয়"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "মোৰ ৱেব একাওন্টসমূহ"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "একাওন্ট %s ক %s -ৰে সম্পাদন কৰা হৈছে।"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "একাওন্ট %s ক Empathy ত সম্পাদন কৰিব নোৱাৰি।"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "মোৰ ৱেব একাওন্টসমূহ লঞ্চ কৰক"
+
+#~ msgid "Edit %s"
+#~ msgstr "%s সম্পাদনা কৰক"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "বাতিল কৰক (_n)"
+
+#~ msgid "Personal Information"
+#~ msgstr "ব্যক্তিগত তথ্য"
+
+#~ msgid "Ungrouped"
+#~ msgstr "দলীয় নহয়"
+
+#~ msgid "Favorite People"
+#~ msgstr "পছন্দৰ মানুহ"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "সম্পাদনা কৰক (_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "এটা পৰিচয় নিৰ্বাচন কৰক"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "সংযুক্ত পৰিচয়সমূহ"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "সংযোগ কৰিবলে পৰিচয়সমূহ বাছক"
+
+#~ msgid "New contact preview"
+#~ msgstr "নতুন পৰিচয় পূৰ্বদৰ্শন"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "বাওফালে থকা তালিকাত নিৰ্বাচন কৰা পৰিচয়সমূহ একেলগে সংযুক্ত কৰা হব।"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "পৰিচয়সমূহ সংযোগ কৰক (_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "পৰিচয়সমূহ সংযুক্ত কৰক"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "অসংযুক্ত কৰক (_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "প্ৰদৰ্শিত সংযুক্ত পৰিচয়সমূহক পৃথক পৰিচয়সমূহত সম্পূৰ্ণভাৱে বিভাজন কৰক।"
+
+#~ msgid "_Link"
+#~ msgstr "সংযুক্ত কৰক (_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "সংযুক্ত পৰিচয়সমূহ '%s' অসংযুক্ত কৰিব নে?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "আপুনি নিশ্চিত নে আপুনি এই সংযুক্ত পৰিচয়সমূহ অসংযুক্ত কৰিব বিচাৰে? ই সংযুক্ত "
+#~ "পৰিচয়সমূহক সম্পূৰ্ণভাৱে পৃথক পৰিচয়সমূহত বিভাজন কৰিব।"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "অসংযুক্ত কৰক (_U)"
+
+#~ msgid "Contact ID:"
+#~ msgstr "পৰিচয়ৰ ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "চেট (_h)"
+
+#~ msgid "Send _Video"
+#~ msgstr "ভিডিঅ' পঠাওক (_V)"
+
+#~ msgid "C_all"
+#~ msgstr "কল (_a)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "আপোনাৰ উপস্থিতি আৰু বৰ্তমান অৱস্থাৰ তথ্য নিৰ্ধাৰণ কৰক"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "নিৰ্বাচিত পৰিচয়ে নথিপত্ৰসমূহ গ্ৰহণ কৰিব নোৱাৰে।"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "নিৰ্বাচিত পৰিচয় অফলাইন।"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "একাওন্টসমূহ ইমপোৰ্ট কৰোতে এটা ত্ৰুটি হৈছিল।"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "একাওন্ট বিৱৰণসমূহ বিশ্লেষণ কৰোতে এটা ত্ৰুটি হৈছিল।"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "একাওন্ট সৃষ্টি কৰোতে এটা ত্ৰুটি হৈছিল।"
+
+#~ msgid "There was an error."
+#~ msgstr "এটা ত্ৰুটি হৈছিল।"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "ত্ৰুটি বাৰ্তা আছিল: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "আপুনি হয় উভতি যাব পাৰে আৰু আপোনাৰ একাওন্ট বিৱৰনসমূহ পুনৰ সোমোৱাৰ চেষ্টা কৰিব "
+#~ "পাৰে অথবা এই সহায়ক প্ৰস্থান কৰক আৰু একাওন্টসমূহ পিছত সম্পাদনা মেনুৰ পৰা যোগ কৰক।"
+
+#~ msgid "An error occurred"
+#~ msgstr "এটা ত্ৰুটি দেখা দিছে"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "প্ৰস্তুত কৰাৰ উদ্দেশ্যে অন্য কোনো চেটৰ একাওন্ট উপস্থিত আছে নেকি ?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "আপোনাৰ একাওন্টৰ বিবৰণ ইয়াত লিখক"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "কি ধৰনৰ চেটৰ একাওন্ট আপুনি নিৰ্মাণ কৰিবলৈ ইচ্ছুক ?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "চেটৰ অন্য একাওন্ট নিৰ্মাণ কৰিবলৈ ইচ্ছুক নেকি?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "নতুন একাওন্টৰ বিৱৰণ লিখক"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Empathy ৰ সৈতে আপুনি কাষৰীয়া মানুহ আৰু বন্ধুসকল আৰু সহকৰ্মীসকল যোনে Google Talk, "
+#~ "AIM, Windows Live আৰু অন্য বহতো চেট প্ৰগ্ৰামসমূহ ব্যৱহাৰ কৰে সিহতৰ লগত অনলাইন "
+#~ "চেট কৰিব পাৰিব। এটা মাক্ৰোফোন অথবা এটা ৱেবকেমৰ সৈতে আপুনি অডিঅ' অথবা ভিডিঅ' "
+#~ "কলসমূহ কৰিব পাৰিব।"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "অন্য কোনো চেটৰ প্ৰোগ্ৰামৰ সৈতে ব্যৱহৃত হৈছে এনে কোনো একাওন্ট কি বৰ্তমানে উপস্থিত "
+#~ "আছে?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "হয়, চিহ্নিত স্থানৰ পৰা মোৰ একাওন্টৰ তথ্য ইমপোৰ্ট কৰা হ'ব "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "হয়, মোৰ একাওন্টৰ তথ্য মই এতিয়ায় লিখিবলৈ ইচ্ছুক"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "নহয়, মই নতুন একাওন্ট প্ৰাপ্ত কৰিবলৈ ইচ্ছুক"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "নহয়, বৰ্তমানে মই অকল ওচৰৰ ব্যক্তিৰ তথ্য চাবলৈ ইচ্ছুক"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "ইমপোৰ্ট কৰাৰ উদ্দেশ্যে একাওন্ট নিৰ্বাচন কৰক:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "নহয়, এতিয়াৰ কাৰণে এইয়াই"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "সম্পাদনা কৰক -> একাওন্টসমূহ"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "মই এই বৈশিষ্ট এতিয়ায় সামৰ্থবান কৰিব নিবিচাৰো (_n)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "আপুনি আপোনাৰ স্থানীয় নেটৱাৰ্কত সংযুক্ত মানুহবোৰৰ লগত চেট কৰিব নোৱাৰিব কাৰণ, "
+#~ "telepathy-salut ইনস্টল নাই। যদি আপুনি এই বৈশিষ্ট সামৰ্থবান কৰিব বিচাৰে, অনুগ্ৰহ "
+#~ "কৰি telepathy-salut পেকেইজ ইনস্টল কৰক আৰএ একাওন্টসমূহ ডাইলগৰ পৰা এটা কাষৰীয়া "
+#~ "মানুহবোৰ একাওন্ট সৃষ্টি কৰক"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "বাৰ্তা আৰু VoIP একাওন্টসমূহ সহায়ক"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Empathy লৈ স্বাগতম"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "আপোনাৰ উপস্থিত একাওন্ট ইমপোৰ্ট কৰক"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "অনুগ্ৰহ কৰি ব্যক্তিগত বিৱৰণসমূহ সোমাওক"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "আপুনি এটা নতুন একাওন্ট সৃষ্টি কৰিব লৈছে, যাৰ ফলত আপোনাৰ পৰিৱৰ্তনসমূহ\n"
+#~ "আতৰোৱা হব। আপুনি নিশ্চিত নে আপুনি আগবাঢ়িব বিচাৰে?"
+
+#~ msgid "Protocol:"
+#~ msgstr "প্ৰটোকল:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "অজ্ঞাত"
+
+#~ msgid "_Personal Information"
+#~ msgstr "ব্যক্তিগত তথ্য (_P)"
+
+#~ msgid "Input level:"
+#~ msgstr "ইনপুট স্তৰ:"
+
+#~ msgid "Input volume:"
+#~ msgstr "ইনপুট ভলিউম:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "নতুন চেটসমূহ পৃথক উইন্ডোত খোলা হ'ব (_O)"
+
 #~ msgid "Send and receive messages"
 #~ msgstr "বাৰ্তা পঠিয়াওক আৰু পাওক"
 
@@ -4716,7 +4952,7 @@ msgstr "ফলা মিলাওক (_M)"
 #~ msgstr "পূৰ্ববৰ্তী চেট"
 
 #~ msgid "_For:"
-#~ msgstr "-ৰ কাৰণে: (_F)"
+#~ msgstr "ৰ কাৰণে: (_F)"
 
 #~ msgid "Edit Custom Messages..."
 #~ msgstr "স্বনিৰ্বাচিত বাৰ্তা সম্পাদনা..."
diff --git a/po/be.po b/po/be.po
index ffa1324be..05948757f 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,467 +5,478 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-28 23:43+0300\n"
-"PO-Revision-Date: 2011-12-28 23:44+0300\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-06 15:16+0000\n"
+"PO-Revision-Date: 2012-03-07 23:11+0300\n"
 "Last-Translator: Kasia Bondarava <kasia.bondarava@gmail.com>\n"
 "Language-Team: Belarusian <be-i18n-gnome@googlegroups.com>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: be\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Чат у Google Talk, Facebook, MSN ды інш."
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Інтэрнэт-камунікатар"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Інтэрнэт-камунікатар Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Інтэрнэт-камунікатар"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Чат у Google Talk, Facebook, MSN ды інш."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Конты камунікатара і VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Кіраванне контамі камунікатара і VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Заўсёды адкрываць новае акно для новага чату."
+msgid "Connection managers should be used"
+msgstr "Трэба выкарыстоўваць кіраўнікоў злучэнняў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Прыстасаванне відэакамеры"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Ці трэба выкарыстоўваць кіраўнікоў злучэнняў для аўтаматычнага адлучэння/"
+"перазлучэння."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Размяшчэнне відэакамеры"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy мусіць аўтаматычна злучацца пры запуску"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Знак, які трэба ўстаўляць пасля мянушкі пры яе дапаўненні клавішай Тab у "
-"групавым чаце."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ці мусіць Empathy аўтаматычна злучацца з сеткамі пры запуску."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Матыў акна чату"
+msgid "Empathy should auto-away when idle"
+msgstr ""
+"Empathy мусіць аўтаматычна пераходзіць у рэжым адсутнасці пры бяздзейнасці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Адмена матыва акна чату"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Спіс моў для праверкі арфаграфіі, падзеленых коскамі (напрыклад, \"en, be, ru"
-"\")."
+"Ці мусіць Empathy аўтаматычна пераходзіць у рэжым адсутнасці пры "
+"бяздзейнасці карыстальніка."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Прадвызначаная папка для сцягнутых файлаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Кампактны спіс кантактаў"
+msgid "The default folder to save file transfers in."
+msgstr "Прадвызначаная папка для захавання атрыманых файлаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Трэба выкарыстоўваць кіраўнікоў злучэнняў"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Магічны лік, які ўжываецца для праверкі, ці трэба запускаць задачы ачысткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Крытэрый сартавання спіса кантактаў"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c выкарыстоўвае гэты лік для праверкі, ці трэба запускасць задачы ачысткі. Карыстальнікам не варта ўручную змяняць значэнне гэтага ключа."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Сцежка аб'екта D-Bus, звязанага з апошнім контам, абраным для ўваходу ў "
-"пакой."
+msgid "Show offline contacts"
+msgstr "Паказваць пазасеткавыя кантакты"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Прадвызначанае прыстасаванне відэакамеры для відэаразмоў, напрыклад \"/dev/"
-"video0\"."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ці трэба паказваць пазасеткавыя кантакты ў спісе кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Прадвызначаны каталог для выбару аватар"
+msgid "Show avatars"
+msgstr "Паказваць аватары"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Не паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Ці трэба паказваць аватары ў спісе кантактаў і вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Не ўжываць гукавыя сігналы ў рэжыме адсутнасці"
+msgid "Show protocols"
+msgstr "Паказваць інфармацыю аб пратаколе"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Паказваць уваходныя падзеі ў абшары стану"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ці трэба паказваць інфармацыю аб пратаколе ў спісе кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Паказваць уваходныя падзеі ў абшары стану. Калі выключана, адразу паказваць "
-"іх карыстальніку."
+msgid "Show Balance in contact list"
+msgstr "Паказваць баланс рахунку у спісе кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Падтрымка фільтрацыі рэха"
+msgid "Whether to show account balances in the contact list."
+msgstr "Ці трэба паказваць баланс контаў у спісе кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy можа публікаваць месцазнаходжанне карыстальніка"
+msgid "Compact contact list"
+msgstr "Кампактны спіс кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy можа выкарыстоўваць GPS для вызначэння месцазнаходжання"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ці трэба паказваць спіс кантактаў у кампактным рэжыме."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy можа выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання"
+msgid "Hide main window"
+msgstr "Схаваць галоўнае акно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy можа выкарыстоўваць сетку для вызначэння месцазнаходжання"
+msgid "Hide the main window."
+msgstr "Схаваць галоўнае акно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Прадвызначаная папка для сцягнутых файлаў"
+msgid "Default directory to select an avatar image from"
+msgstr "Прадвызначаны каталог для выбару аватар"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathy мусіць аўтаматычна пераходзіць у рэжым адсутнасці пры бяздзейнасці"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Апошні каталог, з якога была выбрана аватара."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy мусіць аўтаматычна злучацца пры запуску"
+msgid "Open new chats in separate windows"
+msgstr "Адкрываць новыя чаты ў асобных вокнах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy мусіць пагаршаць дакладнасць месцазнаходжання"
+msgid "Always open a separate chat window for new chats."
+msgstr "Заўсёды адкрываць новае акно для новага чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy мусіць выкарыстоўваць аватару кантакта як значок для акна чату"
+msgid "Display incoming events in the status area"
+msgstr "Паказваць уваходныя падзеі ў абшары стану"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Уключыць прылады распрацоўшчыка WebKit"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Паказваць уваходныя падзеі ў абшары стану. Калі выключана, адразу паказваць "
+"іх карыстальніку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Ужываць выплыўныя апавяшчэнні для новых паведамленняў"
+msgid "The position for the chat window side pane"
+msgstr "Размяшчэнне бакавога абшару ў акне чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Правяраць арфаграфію"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Захаванае размяшчэнне бакавога абшару ў акне чату (у пікселах)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Схаваць галоўнае акно"
+msgid "Show contact groups"
+msgstr "Паказваць групы кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Схаваць галоўнае акно."
+msgid "Whether to show groups in the contact list."
+msgstr "Ці трэба паказваць групы ў спісе кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Апошні конт, выбраны ў дыялогу ўваходу ў пакой"
+msgid "Contact list sort criterion"
+msgstr "Крытэрый сартавання спіса кантактаў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Знак пасля дапоўненай мянушкі"
+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 ""
+"Крытэрый сартавання спіса кантактаў. Прадвызначаныя паводзіны - сартаваць "
+"паводле стану кантактаў - уключаюцца значэннем \"state\". Значэнне \"name\" "
+"уключыць сартаванне паводле імёнаў кантактаў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Адкрываць новыя чаты ў асобных вокнах"
+msgid "Use notification sounds"
+msgstr "Агучваць апавяшчэнні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Сцежка да патрэбнага матыва Adium"
+msgid "Whether to play a sound to notify of events."
+msgstr "Ці трэба агучваць падзеі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Сцежка да патрэбнага матыва Adium, калі для чату ўжыты матыў Adium."
+msgid "Disable sounds when away"
+msgstr "Не ўжываць гукавыя сігналы ў рэжыме адсутнасці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Агучваць уваходныя паведамленні"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ці трэба ўжываць гукавыя сігналы ў рэжыме адсутнасці ці занятасці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Агучваць з'яўленне новых размоў"
+msgid "Play a sound for incoming messages"
+msgstr "Агучваць уваходныя паведамленні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Агучваць выхадныя паведамленні"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ці трэба агучваць уваходныя паведамленні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Агучваць уваход кантакта ў сетку"
+msgid "Play a sound for outgoing messages"
+msgstr "Агучваць выхадныя паведамленні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Агучваць выхад кантакта з сеткі"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ці трэба агучваць выхадныя паведамленні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Агучваць злучэнне з сеткай"
+msgid "Play a sound for new conversations"
+msgstr "Агучваць з'яўленне новых размоў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Агучваць адлучэнне ад сеткі"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ці трэба агучваць з'яўленне новых размоў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ужываць выплыўныя апавяшчэнні, калі чат не мае фокусу"
+msgid "Play a sound when a contact logs in"
+msgstr "Агучваць уваход кантакта ў сетку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ужываць выплыўныя апавяшчэнні для ўваходу кантакта ў сетку"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ці трэба агучваць уваход кантактаў у сетку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ужываць выплыўныя апавяшчэнні для выхаду кантакта з сеткі"
+msgid "Play a sound when a contact logs out"
+msgstr "Агучваць выхад кантакта з сеткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Размяшчэнне карцінкі з відэакамеры падчас званка."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ці трэба агучваць выхад кантактаў з сеткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Паказваць баланс рахунку у спісе кантактаў"
+msgid "Play a sound when we log in"
+msgstr "Агучваць злучэнне з сеткай"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Паказваць аватары"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ці трэба агучваць злучэнне з сеткай."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Паказваць спіс кантактаў у пакоях"
+msgid "Play a sound when we log out"
+msgstr "Агучваць адлучэнне ад сеткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Паказваць падказку пры закрыцці галоўнага акна"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ці трэба агучваць адлучэнне ад сеткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Паказваць пазасеткавыя кантакты"
+msgid "Enable popup notifications for new messages"
+msgstr "Ужываць выплыўныя апавяшчэнні для новых паведамленняў"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Паказваць інфармацыю аб пратаколе"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Мовы для праверкі арфаграфіі"
+msgid "Disable popup notifications when away"
+msgstr "Не паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Прадвызначаная папка для захавання атрыманых файлаў."
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Ці трэба паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці ці занятасці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Апошні каталог, з якога была выбрана аватара."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ужываць выплыўныя апавяшчэнні, калі чат не мае фокусу"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Размяшчэнне бакавога абшару ў акне чату"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення, "
+"нават калі акно чату ўжо адкрыта, хоць і не мае фокусу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Захаванае размяшчэнне бакавога абшару ў акне чату (у пікселах)."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ужываць выплыўныя апавяшчэнні для ўваходу кантакта ў сетку"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Матыў афармлення размоў у вокнах чату."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Ці трэба паказваць выплыўныя апавяшчэнні пры ўваходзе кантакта ў сетку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Адмена матыва афармлення размоў у вокнах чату."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ужываць выплыўныя апавяшчэнні для выхаду кантакта з сеткі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Ужываць графічныя смайлікі"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ці трэба паказваць выплыўныя апавяшчэнні пры выхадзе кантакта з сеткі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Агучваць апавяшчэнні"
+msgid "Use graphical smileys"
+msgstr "Ужываць графічныя смайлікі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Ужываць матыў для пакояў чату"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ці трэба пераўтвараць смайлікі ў графічныя выявы ў тэксце размоў."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Ці можа Empathy паведамляць аб месцазнаходжанні карыстальніка яго кантактам."
+msgid "Show contact list in rooms"
+msgstr "Паказваць спіс кантактаў у пакоях"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ці можа Empathy выкарыстоўваць GPS для вызначэння месцазнаходжання."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ці трэба паказваць спіс кантактаў у пакоях чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Ці можа Empathy выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання."
+msgid "Chat window theme"
+msgstr "Матыў акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ці можа Empathy выкарыстоўваць сетку для вызначэння месцазнаходжання."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Матыў афармлення размоў у вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ці мусіць Empathy аўтаматычна злучацца з сеткамі пры запуску."
+msgid "Chat window theme variant"
+msgstr "Адмена матыва акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Ці мусіць Empathy аўтаматычна пераходзіць у рэжым адсутнасці пры "
-"бяздзейнасці карыстальніка."
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Адмена матыва афармлення размоў у вокнах чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Ці мусіць Empathy пагаршаць дакладнасць месцазнаходжання карыстальніка дзеля "
-"абароны яго права на прыватнасць."
+msgid "Path of the Adium theme to use"
+msgstr "Сцежка да патрэбнага матыва Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ці мусіць Empathy выкарыстоўваць аватару кантакта як значок акна чату."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Сцежка да патрэбнага матыва Adium, калі для чату ўжыты матыў Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Ці трэба ўключыць прылады распрацоўшчыка WebKit (напрыклад, Web Inspector)."
+msgid "Enable WebKit Developer Tools"
+msgstr "Уключыць прылады распрацоўшчыка WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Ці трэба выкарыстоўваць кіраўнікоў злучэнняў для аўтаматычнага адлучэння/"
-"перазлучэння."
+"Ці трэба ўключыць прылады распрацоўшчыка WebKit (напрыклад, Web Inspector)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Inform other users when you are typing to them"
 msgstr ""
-"Ці трэба правяраць арфаграфію напісаных слоў па спісе магчымых моў тэксту."
+"Паведамляць іншым карыстальнікам аб тым, што вы пішаце для іх паведамленне"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ці трэба пераўтвараць смайлікі ў графічныя выявы ў тэксце размоў."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Ці трэба пасылаць апавяшчэнні аб стане чату тыпу \"пішу\" ці \"перастаў "
+"пісаць\". Пакуль што не ўплывае на стан адсутнасці."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Ці трэба ўключыць фільтрацыю рэха Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Ужываць матыў для пакояў чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ці трэба агучваць уваход кантактаў у сетку."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ці трэба ўжываць гэты матыў для пакояў чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ці трэба агучваць выхад кантактаў з сеткі."
+msgid "Spell checking languages"
+msgstr "Мовы для праверкі арфаграфіі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Ці трэба агучваць падзеі."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Спіс моў для праверкі арфаграфіі, падзеленых коскамі (напрыклад, \"en, be, ru"
+"\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ці трэба агучваць уваходныя паведамленні."
+msgid "Enable spell checker"
+msgstr "Правяраць арфаграфію"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ці трэба агучваць з'яўленне новых размоў."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Ці трэба правяраць арфаграфію напісаных слоў па спісе магчымых моў тэксту."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ці трэба агучваць выхадныя паведамленні."
+msgid "Nick completed character"
+msgstr "Знак пасля дапоўненай мянушкі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ці трэба агучваць злучэнне з сеткай."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак, які трэба ўстаўляць пасля мянушкі пры яе дапаўненні клавішай Тab у "
+"групавым чаце."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ці трэба агучваць адлучэнне ад сеткі."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy мусіць выкарыстоўваць аватару кантакта як значок для акна чату"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ці трэба ўжываць гукавыя сігналы ў рэжыме адсутнасці ці занятасці."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Ці мусіць Empathy выкарыстоўваць аватару кантакта як значок акна чату."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Ці трэба паказваць выплыўныя апавяшчэнні пры выхадзе кантакта з сеткі."
+msgid "Last account selected in Join Room dialog"
+msgstr "Апошні конт, выбраны ў дыялогу ўваходу ў пакой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Ці трэба паказваць выплыўныя апавяшчэнні пры ўваходзе кантакта ў сетку."
+"Сцежка аб'екта D-Bus, звязанага з апошнім контам, абраным для ўваходу ў "
+"пакой."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення, "
-"нават калі акно чату ўжо адкрыта, хоць і не мае фокусу."
+msgid "Camera device"
+msgstr "Прыстасаванне відэакамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Ці трэба паказваць выплыўныя апавяшчэнні пры атрыманні новага паведамлення."
+"Прадвызначанае прыстасаванне відэакамеры для відэаразмоў, напрыклад \"/dev/"
+"video0\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Ці трэба паказваць баланс контаў у спісе кантактаў."
+msgid "Camera position"
+msgstr "Размяшчэнне відэакамеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Ці трэба паказваць аватары ў спісе кантактаў і вокнах чату."
+msgid "Position the camera preview should be during a call."
+msgstr "Размяшчэнне карцінкі з відэакамеры падчас званка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Ці трэба паказваць пазасеткавыя кантакты ў спісе кантактаў."
+msgid "Echo cancellation support"
+msgstr "Падтрымка фільтрацыі рэха"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Ці трэба паказваць выплыўныя апавяшчэнні ў рэжыме адсутнасці ці занятасці."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ці трэба ўключыць фільтрацыю рэха Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ці трэба паказваць інфармацыю аб пратаколе ў спісе кантактаў."
+msgid "Show hint about closing the main window"
+msgstr "Паказваць падказку пры закрыцці галоўнага акна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ці трэба паказваць спіс кантактаў у пакоях чату."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Ці трэба паказваць спіс кантактаў у кампактным рэжыме."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -473,29 +484,51 @@ msgstr ""
 "Ці трэба паказваць дыялогавае акенца пры закрыцці галоўнага акна з дапамогай "
 "кнопкі \"x\" у загалоўнай стужцы."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy можа публікаваць месцазнаходжанне карыстальніка"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Ці можа Empathy паведамляць аб месцазнаходжанні карыстальніка яго кантактам."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ці трэба ўжываць гэты матыў для пакояў чату."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy можа выкарыстоўваць сетку для вызначэння месцазнаходжання"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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 "Whether Empathy can use the network to guess the location."
+msgstr "Ці можа Empathy выкарыстоўваць сетку для вызначэння месцазнаходжання."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
-"Крытэрый сартавання спіса кантактаў. Прадвызначаныя паводзіны - сартаваць "
-"паводле імёнаў кантактаў - уключаюцца значэннем \"name\". Значэнне \"state\" "
-"уключыць сартаванне паводле стану кантактаў."
+"Empathy можа выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Кіраванне контамі камунікатара і VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Ці можа Empathy выкарыстоўваць сотавую сетку для вызначэння месцазнаходжання."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Конты камунікатара і VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy можа выкарыстоўваць GPS для вызначэння месцазнаходжання"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ці можа Empathy выкарыстоўваць GPS для вызначэння месцазнаходжання."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy мусіць пагаршаць дакладнасць месцазнаходжання"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Ці мусіць Empathy пагаршаць дакладнасць месцазнаходжання карыстальніка дзеля "
+"абароны яго права на прыватнасць."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -521,7 +554,7 @@ msgstr "Памылка пры спробе перадачы файла"
 msgid "The other participant is unable to transfer the file"
 msgstr "Суразмоўца не здолеў ажыццявіць перадачу файла"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Невядомая прычына"
 
@@ -541,7 +574,7 @@ msgstr "Выбраны файл не з'яўляецца звычайным фа
 msgid "The selected file is empty"
 msgstr "Выбраны файл пусты"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Прапушчаны званок ад %s"
@@ -557,137 +590,137 @@ msgstr "Званок да %s"
 msgid "Call from %s"
 msgstr "Званок ад %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Даступны"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Адсутны"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Нябачны"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Па-за сеткай"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Невядома"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Прычына не азначана"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Уключаны рэжым па-за сеткай"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Сеткавая памылка"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Няўдалая ідэнтыфікацыя"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Памылка шыфравання"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Імя ўжо занята"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертыфікат не пададзены"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертыфікат не заслугоўвае даверу"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертыфікат састарэў"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертыфікат не актывізаваны"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Назва камп'ютара ў сертыфікаце не адпавядае патрэбнай"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Адбітак сертыфіката не адпавядае патрэбнаму"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертыфікат уласнаручна падпісаны"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Памылка сертыфіката"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шыфраванне недаступнае"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Хібны сертыфікат"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Адмоўлена ў злучэнні"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Не ўдалося ўсталяваць злучэнне"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Злучэнне страчана"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Гэты рэсурс ужо злучаны з серверам"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Гэты конт ужо злучаны з серверам"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Злучэнне заменена новым для таго ж самага рэсурсу"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Такі конт ужо існуе на серверы"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер надта заняты і не можа абслужыць гэта злучэнне"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертыфікат быў адкліканы"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Для сертыфіката выкарыстаны слабы або небяспечны алгарытм шыфравання"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -695,27 +728,31 @@ msgstr ""
 "Даўжыня сертыфіката сервера або глыбіня яго ланцуга перавышае абмежаванне, "
 "выстаўленае крыптаграфічнай бібліятэкай"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Ваша апраграмаванне надта старое"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Унутраная памылка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Людзі паблізу"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Японія"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -723,7 +760,7 @@ msgstr[0] "%d секунда таму"
 msgstr[1] "%d секунды таму"
 msgstr[2] "%d секунд таму"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -731,7 +768,7 @@ msgstr[0] "%d хвіліна таму"
 msgstr[1] "%d хвіліны таму"
 msgstr[2] "%d хвілін таму"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -739,7 +776,7 @@ msgstr[0] "%d гадзіна таму"
 msgstr[1] "%d гадзіны таму"
 msgstr[2] "%d гадзін таму"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -747,7 +784,7 @@ msgstr[0] "%d дзень таму"
 msgstr[1] "%d дні таму"
 msgstr[2] "%d дзён таму"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -755,7 +792,7 @@ msgstr[0] "%d тыдзень таму"
 msgstr[1] "%d тыдні таму"
 msgstr[2] "%d тыдняў таму"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -763,16 +800,16 @@ msgstr[0] "%d месяц таму"
 msgstr[1] "%d месяцы таму"
 msgstr[2] "%d месяцаў таму"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "у будучыні"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Усе конты"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Конт"
 
@@ -790,30 +827,30 @@ msgstr "Сервер"
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Імя карыстальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "У_жыць"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Увайсці"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Такі конт ужо існуе на гэтым серверы"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Стварыць новы конт на гэтым серверы"
 
@@ -822,137 +859,137 @@ msgstr "Стварыць новы конт на гэтым серверы"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Конт %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Новы конт"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Прыклад:</b> МаёКантактнаеІмя"
+#: ../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:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Адмысловае"
+msgid "Screen _Name:"
+msgstr "_Кантактнае імя:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Прыклад:</b> МаёКантактнаеІмя"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомніць пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запомніць пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Кантактнае імя:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Ваш пароль да конта AIM"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Адмысловае"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Ваша кантактнае імя для конта AIM"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Ваш пароль да конта AIM"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Прыклад:</b> імя_карыстальніка"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомніць пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Ід_энтыфікатар конта:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Прыклад:</b> імя_карыстальніка"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Ваш ідэнтыфікатар карыстальніка да конта GroupWise"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Ваш пароль да конта GroupWise"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ-ід_энтыфікатар:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Прыклад:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ-ід_энтыфікатар:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Ваш ідэнтыфікатар да конта ICQ"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Ваш пароль да конта ICQ"
 
@@ -989,11 +1026,23 @@ msgstr "Options"
 msgid "None"
 msgstr "Нічога"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Сетка"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Сетка:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Знаказбор:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Серверы"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1001,14 +1050,6 @@ msgstr ""
 "Большасць IRC-сервераў не патрабуе пароляў, таму калі вы не ўпэўнены, проста "
 "пакіньце графу пароля пустой."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Сетка"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Сетка:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Мянушка:"
@@ -1025,48 +1066,20 @@ msgstr "Развітальнае паведамленне:"
 msgid "Real name:"
 msgstr "Сапраўднае імя:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Серверы"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Ваша мянушка ў IRC-сетцы"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "IRC-сетка"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Прыклад:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Прыклад:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Абавязковае шыфраванне (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "І_гнараваць памылкі SSL-сертыфіката"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Засланіць настройкі сервера ўласнымі"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Прыярытэт:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Ваша мянушка ў IRC-сетцы"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Рэсурс:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Ваша імя карыстальніка ў сетцы Facebook"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1079,179 +1092,203 @@ msgstr ""
 "Каб выбраць сабе імя, наведайце <a href=\"http://www.facebook.com/username/"
 "\">гэту старонку</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "_Выкарыстоўваць стары SSL-пратакол"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Ваш пароль да конта Facebook"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Ваша імя карыстальніка ў сетцы Facebook"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Ваш ідэнтыфікатар Google"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Прыклад:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Ваш пароль да конта Google"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Прыклад:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "І_гнараваць памылкі SSL-сертыфіката"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Прыярытэт:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Рэсурс:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Абавязковае шыфраванне (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "_Выкарыстоўваць стары SSL-пратакол"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Засланіць настройкі сервера ўласнымі"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Ваш ідэнтыфікатар Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Ваш пароль да конта Jabber"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Пажаданы ідэнтыфікатар Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Ваш пароль да конта Jabber"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Ваш пароль да пажаданага конта Jabber"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Прыклад:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Ваш ідэнтыфікатар Windows Live"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Ваш пароль да конта Windows Live"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_Электронны паштовы адрас:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Мянушка:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Прозвішча:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "Ім_я:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Апублікаванае імя:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber-ід_энтыфікатар:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Прозвішча:"
+msgid "E-_mail address:"
+msgstr "_Электронны паштовы адрас:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Апублікаванае імя:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Імя _карыстальніка:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Прыклад:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Імя для ідэнтыфікацыі карыстальніка:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Пошук сувязі"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Аўтаматычны пошук STUN-сервера"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Выкарыстоўваць гэты конт для званкоў на _хатнія і мабільныя тэлефоны"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ігнараваць памылкі TLS-пратакола"
+msgid "NAT Traversal Options"
+msgstr "Опцыі праходу праз NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Прамежак часу (у секундах)"
+msgid "Proxy Options"
+msgstr "Опцыі проксі-сервера"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Опцыі падтрымкі сувязі"
+msgid "Miscellaneous Options"
+msgstr "Разнастайныя опцыі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Вольная маршрутызацыя"
+msgid "STUN Server:"
+msgstr "STUN-сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механізм:"
+msgid "Discover the STUN server automatically"
+msgstr "Аўтаматычны пошук STUN-сервера"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Разнастайныя опцыі"
+msgid "Discover Binding"
+msgstr "Пошук сувязі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Опцыі праходу праз NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Опцыі падтрымкі сувязі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механізм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Опцыі проксі-сервера"
+msgid "Interval (seconds)"
+msgstr "Прамежак часу (у секундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Імя для ідэнтыфікацыі карыстальніка:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Транспарт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-сервер:"
+msgid "Loose Routing"
+msgstr "Вольная маршрутызацыя"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Ігнараваць памылкі TLS-пратакола"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Транспарт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Выкарыстоўваць гэты конт для званкоў на _хатнія і мабільныя тэлефоны"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Ваш пароль да конта SIP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Ваш ідэнтыфікатар да конта SIP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Імя _карыстальніка:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Ваш пароль да конта SIP"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-ід_энтыфікатар:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "І_гнараваць запрашэнні на канферэнцыі і ў пакоі чату"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Настройкі мясцовасці для спіса пакояў:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Ваш ідэнтыфікатар да конта Yahoo!"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Ваш пароль да конта Yahoo!"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-ід_энтыфікатар:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Настройкі мясцовасці для спіса пакояў:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1289,65 +1326,65 @@ msgstr "Усе файлы"
 msgid "Click to enlarge"
 msgstr "Пстрыкніце, каб павялічыць"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Узнікла памылка пры званку"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Гэты кантакт не падтрымлівае званкоў"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Гэты кантакт па-за сеткай"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Гэты кантакт хібны"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Гэты пратакол не падтрымлівае экстранныя званкі"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Вам не стае грошай, каб перанакіраваць гэты званок"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Не ўдалося распачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Гэтая размова не падтрымлівае тэмы"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Вы не маеце дазволу на змяненне тэмы размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "\"%s\" не з'яўляецца прыдатным ідэнтыфікатарам кантакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ачысціць усе паведамленні ў адкрытым акне размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тэма>: прызначыць тэму для актыўнай размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ідэнтыфікатар пакоя>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ідэнтыфікатар пакоя>: далучыцца да групавога чату ў пакоі"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1355,24 +1392,24 @@ msgstr ""
 "/part [<ідэнтыфікатар пакоя>] [<прычына>]: пакінуць групавы чат, звычайна "
 "актыўны"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <кантакт> [<паведамленне>]: распачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <кантакт> <паведамленне>: распачаць прыватны чат"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <мянушка>: змяніць сваю мянушку на актыўным серверы"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <паведамленне>: паслаць ACTION-паведамленне ў адкрытае акно размовы"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1383,11 +1420,11 @@ msgstr ""
 "\". Напрыклад: \"/say /join выкарыстоўваецца для далучэння да новага "
 "групавога чату ў пакоі\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <кантакт>: паказаць інфармацыю аб кантакце"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1395,122 +1432,128 @@ msgstr ""
 "/help [<загад>]: паказаць усе вядомыя загады. Калі пададзены <загад>, "
 "паказаць правілы яго выкарыстання."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Правілы карыстання: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Невядомы загад"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "Невядомы загад. Каб паглядзець спіс усіх вядомых загадаў, выканайце /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "не стае грошай для пасылкі паведамлення"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Памылка пасылкі паведамлення \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Памылка пасылкі паведамлення: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "не стае грошай для пасылкі паведамлення. <a href='%s'>Папоўніце рахунак</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не падтрымліваецца"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "па-за сеткай"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "хібны кантакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "адмоўлена ў дазволе"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "надта доўгае паведамленне"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "не рэалізавана"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "невядома"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тэма:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тэма вызначана як: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Тэма вызначана кантактам %s як: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Тэма не вызначана"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(няма прапаноў)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Дадаць \"%s\" у слоўнік"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Дадаць \"%s\" у слоўнік (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Уставіць смайлік"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Паслаць"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Прапанаваныя _варыянты выпраўлення"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Не ўдалося атрымаць свежыя журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "Удзельнік %s цяпер па-за сеткай"
@@ -1518,12 +1561,12 @@ msgstr "Удзельнік %s цяпер па-за сеткай"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Удзельнік %2$s выпхнуў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "Удзельніка %s выпхнулі з пакоя"
@@ -1531,17 +1574,17 @@ msgstr "Удзельніка %s выпхнулі з пакоя"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Удзельнік %2$s забаніў удзельніка %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "Удзельніка %s забанілі"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "Удзельнік %s пакінуў пакой"
@@ -1551,17 +1594,17 @@ msgstr "Удзельнік %s пакінуў пакой"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "Удзельнік %s увайшоў у пакой"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Удзельнік %s цяпер называецца %s"
@@ -1569,55 +1612,55 @@ msgstr "Удзельнік %s цяпер называецца %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Адлучаны"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Ці вы хочаце захаваць гэты пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомніць"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Не зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Паўтарыць"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Хібны пароль. Паўтарыце спробу:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Гэты пакой абаронены паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Далучыцца"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Злучаны"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Размова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1649,10 +1692,10 @@ msgstr "Рэдагаванне спіса блакіраваных кантак�
 #. 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:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Конт:"
 
@@ -1662,7 +1705,7 @@ msgstr "Блакіраваныя кантакты"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Выдаліць"
@@ -1685,34 +1728,30 @@ msgstr "_Адкрыць спасылку"
 msgid "%A %B %d %Y"
 msgstr "%A, %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Асабістыя звесткі"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Новы кантакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блакіраваць %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 ""
 "Ці вы сапраўды хочаце блакіраваць \"%s\" у магчымасці кантактавання з вамі?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блакіраваць"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1721,17 +1760,17 @@ msgstr[1] "_Паскардзіцца на гэтыя кантакты"
 msgstr[2] "_Паскардзіцца на гэтыя кантакты"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Вырашыць пазней"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запыт на падпіску"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блакіраваць карыстальніка"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Вырашыць пазней"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1886,7 +1925,7 @@ msgstr "Вышыня:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Месцазнаходжанне"
 
@@ -1912,6 +1951,16 @@ msgstr "Захаваць аватару"
 msgid "Unable to save avatar"
 msgstr "Не ўдалося захаваць аватару"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Асабістыя падрабязнасці"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Падрабязнасці аб кантакце"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Поўнае імя"
@@ -1977,54 +2026,49 @@ msgstr "для пошты"
 msgid "parcel"
 msgstr "для пасылак"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Месцазнаходжанне</b> (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Ідэнтыфікатар:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Псеўданім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Звесткі аб кліенце"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Кліент:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Месцазнаходжанне</b> (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Падрабязнасці аб кантакце"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Высланы запыт звестак..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Ідэнтыфікатар:"
+msgid "Client Information"
+msgstr "Звесткі аб кліенце"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Высланы запыт звестак..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "АС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Версія:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Кліент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2032,17 +2076,17 @@ msgstr ""
 "Вызначыце групы для гэтага кантакта. Заўважце, што можна не выбіраць ні "
 "адной групы або выбраць адразу некалькі."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Дадаць групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбар"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
@@ -2064,156 +2108,141 @@ msgstr[2] "Наступныя ідэнтычнасці не могуць быц�
 msgid "Edit Contact Information"
 msgstr "Рэдагаванне кантактных звестак"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Звязаныя кантакты"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Вызначыце кантакты для сувязі"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Папярэдні агляд новага кантакта"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Кантакты, вылучаныя ў левым спісе, будуць аб'яднаныя ў адно."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Выберыце конт для перанакіравання званка"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Званок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мабільны тэлефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Працоўны тэлефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Хатні тэлефон"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Блакіраваць кантакт"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Чат"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "П_аслаць SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Аўдыязванок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Відэазванок"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "_Папярэднія размовы"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Паслаць файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Падзяліцца доступам да стала"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Упадабаны"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не ўсталяваны"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Усталюйце gnome-contacts, каб атрымаць доступ да падрабязнасцяў кантактаў."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_Звесткі"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Рэдагаваць"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Аб'яднаць кантакты..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Запрашаю вас у гэты пакой"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Запрасіць у пакой групавога чату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Дадаць кантакт..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Выдаліць і _блакіраваць"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ці вы сапраўды хочаце выдаліць групу \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Выдаленне групы"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Выдаліць"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ці вы сапраўды хочаце выдаліць кантакт \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2222,7 +2251,7 @@ msgstr ""
 "Ці вы сапраўды хочаце выдаліць аб'яднальны кантакт \"%s\"? Гэта аперацыя "
 "таксама выдаліць яго складовыя кантакты."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Выдаленне кантакта"
 
@@ -2238,23 +2267,23 @@ msgstr[2] "Аб'яднальны кантакт для %u кантактаў"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Месцазнаходжанне</b> (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "У сетцы, з тэлефона або мабільнага прыстасавання"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Новая сетка"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Выберыце IRC-сетку"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_Ануляваць змены ў спісе сетак"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Выбраць"
@@ -2267,91 +2296,48 @@ msgstr "новы сервер"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Аб'яднанне кантактаў"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Раз'яднаць..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Цалкам раздзяліць аб'яднаныя кантакты."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Аб'яднаць"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Раз'яднаць аб'яднаныя кантакты \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ці вы сапраўды хочаце раз'яднаць аб'яднаныя кантакты? Гэта прывядзе да іх "
-"поўнага падзелу."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Раз'яднаць"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Журнал"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Паказаць"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Пошук"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Чат у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Чат з %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2359,7 +2345,7 @@ msgstr[0] "%s секунда"
 msgstr[1] "%s секунды"
 msgstr[2] "%s секунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2367,120 +2353,120 @@ msgstr[0] "%s хвіліна"
 msgstr[1] "%s хвіліны"
 msgstr[2] "%s хвілін"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Званок працягваўся %s, скончаны ў %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Сёння"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Учора"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "За ўвесь час"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Усе"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Калі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Усё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Тэкставыя чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Уваходныя званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Выхадныя званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Прапушчаныя званкі"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Што"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ці вы сапраўды хочаце выдаліць усе журналы мінулых размоў?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Ачысціць усё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Выдаліць для:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Загрузка...</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Чат"
+#: ../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 "_Праўка"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Выдаліць усе журналы размоў..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профіль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Відэа"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Чат"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Праўка"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Відэа"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "старонка 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Загрузка...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Гэты кантакт па-за сеткай"
@@ -2527,7 +2513,7 @@ msgid "There was an error starting the conversation"
 msgstr "Узнікла памылка пры пачатку размовы"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Упішыце ідэнтыфікатар кантакту або тэлефонны нумар:"
 
@@ -2537,17 +2523,17 @@ msgid "New Conversation"
 msgstr "Новая размова"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Відэазванок"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Аўдыязванок"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Новы званок"
 
@@ -2603,7 +2589,7 @@ msgstr "Уласныя паведамленні..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Новы конт %s"
@@ -2613,20 +2599,20 @@ msgid "Find:"
 msgstr "Шукаць:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Улічваць рэгістр літар"
+msgid "_Previous"
+msgstr "На_зад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Выраз не знойдзены"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Наперад"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Улічваць рэгістр літар"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "На_зад"
+msgid "Phrase not found"
+msgstr "Выраз не знойдзены"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2672,12 +2658,12 @@ msgstr "Галасавы званок скончаны"
 msgid "Edit Custom Messages"
 msgstr "Рэдагаванне ўласных паведамленняў"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Паведамленне зменена ў %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Звычайны"
 
@@ -2754,34 +2740,38 @@ msgid "Certificate hostname: %s"
 msgstr "Назва камп'ютара з сертыфіката: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Працягнуць"
+msgid "C_ontinue"
+msgstr "_Працягнуць"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Не вартае даверу злучэнне"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Гэта злучэнне не вартае даверу. Усё роўна працягнуць працэдуру?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомніць гэты выбар для наступных злучэнняў"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Падрабязнасці аб сертыфікаце"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Не ўдалося адкрыць URI-адрас"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Выбар файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Не стае вольнай прасторы для захавання файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2790,7 +2780,7 @@ msgstr ""
 "Каб захаваць гэты файл, патрэбна %s вольнай прасторы, а даступна толькі %s. "
 "Выберыце іншае месца для файла."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Уваходны файл ад %s"
@@ -2970,23 +2960,23 @@ msgstr "Няма паведамлення аб памылцы"
 msgid "Instant Message (Empathy)"
 msgstr "Імгненнае паведамленне (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Не злучацца пры запуску"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Не паказваць спіс кантактаў ды іншыя акенцы пры запуску"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Інтэрнэт-камунікатар Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Памылка сувязі з кіраўніком контаў"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3041,233 +3031,83 @@ msgstr ""
 "insomnia <defragbrain@gmail.com>\n"
 "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Падчас імпартавання контаў узнікла памылка."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Падчас разбору падрабязнасцяў аб конце ўзнікла памылка."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Падчас стварэння конта ўзнікла памылка."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Узнікла памылка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Апісанне памылкі: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Вы можаце альбо вярнуцца назад і паўтарыць увод падрабязнасцяў аб вашых "
-"контах, альбо закрыць гэтага памочніка і дадаць конты пазней з дапамогай "
-"меню Праўка."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Узнікла памылка"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Тып вашага конта для чату"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ці вы маеце іншыя конты для чату, якія б вы таксама хацелі настроіць?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Падайце падрабязныя звесткі аб вашым конце"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Тып новага конта для чату"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Ці трэба стварыць іншыя конты для чату?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Падайце падрабязныя звесткі аб новым конце"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"З дапамогай Empathy вы можаце гутарыць з іншымі людзьмі паблізу, а таксама з "
-"сябрамі і калегамі, якія карыстаюцца Google Talk, AIM, Windows Live і іншымі "
-"праграмамі для чату. Калі вы маеце мікрафон ці сеціўную відэакамеру, таксама "
-"можна рабіць аўдыя- і відэазванкі."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ці вы маеце конт, якім ужо карысталіся ў іншай праграме для чату?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Так, трэба імпартаваць настройкі конта з "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Так, я падам настройкі конта"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Не, мне патрэбны новы конт"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Не, пакуль што я толькі хачу ўбачыць людзей паблізу мяне"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Вызначыце конты для імпартавання:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Так"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Не, пакуль што ўсё"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy умее аўтаматычна вышукваць і арганізоўваць чат з людзьмі, якія "
-"карыстаюцца вашай сеткай. Калі вы хочаце выкарыстаць гэту магчымасць, "
-"праверце правільнасць настроек, змешчаных ніжэй. Пазней можна будзе змяніць "
-"гэтыя настройкі або наогул выключыць гэту функцыю ў дыялогавым акенцы \"Конты"
-"\"."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Праўка->Конты"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Пакуль не _трэба ўключаць гэту функцыю"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Вы не зможаце браць удзел у чатах з людзьмі, якія карыстаюцца вашай сеткай, "
-"бо telepathy-salut не ўсталяваны. Калі вы хочаце ўключыць гэту функцыю, "
-"усталюйце пакунак \"telepathy-salut\" і стварыце конт \"Людзі паблізу\" у "
-"акенцы \"Конты\"."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut не ўсталяваны"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Памочнік настройкі контаў для чату і VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Вітаем у Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Імпартаванне наяўных контаў"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Запоўніце анкету з асабістымі звесткамі"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Ваш конт %s мае незахаваныя змены."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Ваш новы конт яшчэ не захаваны."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Злучэнне..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Па-за сеткай - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Адлучаны - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Па-за сеткай - Няма сеткавага злучэння"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Невядомы стан"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Гэты конт быў выключаны, бо ён выкарыстоўвае састарэлы праграмны драйвер, "
+"які ўжо не падтрымліваецца. Каб перанесці гэты конт у новую версію праграмы, "
+"усталюйце пакунак telepathy-haze і перазапусціце сеанс."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Па-за сеткай - Конт выключаны"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Змяненне параметраў злучэння"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Не ўдалося атрымаць асабістыя звесткі з сервера."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Злучыцеся з сеткай, каб змагчы рэдагаваць асабістыя звесткі."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Змяніць параметры злучэння..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ці вы сапраўды хочаце выдаліць %s са свайго камп'ютара?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Гэтае дзеянне не выдаліць ваш конт на серверы."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3276,15 +3116,23 @@ msgstr ""
 "вашых змен. Ці вы сапраўды хочаце працягнуць працэдуру?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Уключыць"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Выключыць"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Прапусціць"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Злучыць"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3296,19 +3144,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Дадаць..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Загрузка звестак аб конце"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Модулі для працы з пратаколамі не ўсталяваныя"
+msgid "_Import…"
+msgstr "І_мпартаваць..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Пратакол:"
+msgid "Loading account information"
+msgstr "Загрузка звестак аб конце"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3316,27 +3160,23 @@ msgstr ""
 "Каб дадаць новы конт, спачатку трэба ўсталяваць модуль падтрымкі адпаведнага "
 "пратакола."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "І_мпартаваць..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Модулі для працы з пратаколамі не ўсталяваныя"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- ідэнтыфікацыйны кліент Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Ідэнтыфікацыйны кліент Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Людзі паблізу"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Аўдыя- і відэакліент Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Аўдыя- і відэакліент Empathy"
 
@@ -3362,15 +3202,15 @@ msgstr "_Бакавая паліца"
 
 #: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
-msgstr "Аўдыяўваход"
+msgstr "Аўдыяўвод"
 
 #: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
-msgstr "Відэаўваход"
+msgstr "Відэаўвод"
 
 #: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
-msgstr "Панэль набору нумару"
+msgstr "Панэль набору"
 
 #: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
@@ -3379,57 +3219,57 @@ msgstr "Падрабязнасці"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Званок: %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP-адрас, які бачыць машына"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адрас, які бачыць сервер у інтэрнэце"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адрас суразмоўцы, бачны з іншага боку злучэння"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP-адрас рэтранслятарнага сервера"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "IP-адрас мультыкаст-групы"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Невядомы"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr "Працягласць злучэння - %d:%02d хв"
+msgstr "Злучэнне: %d:%02d хв"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Тэхнічныя падрабязнасці"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3438,8 +3278,8 @@ msgstr ""
 "Апраграмаванне, якім карыстаецца %s, не разумее ні аднаго з аўдыяфарматаў, "
 "якія падтрымлівае ваш камп'ютар"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3448,8 +3288,8 @@ msgstr ""
 "Апраграмаванне, якім карыстаецца %s, не разумее ні аднаго з відэафарматаў, "
 "якія падтрымлівае ваш камп'ютар"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3458,29 +3298,29 @@ msgstr ""
 "Не ўдалося ўсталяваць злучэнне з %s. Відаць, хтосьці з вас далучаны да "
 "сеткі, якая не дазваляе непасрэднае злучэнне."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "У сетцы ўзнікла памылка"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Апраграмаванне для аўдыяфарматаў, патрэбных для абслугоўвання гэтага званка, "
 "не ўсталявана на гэтым камп'ютары"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Апраграмаванне для відэафарматаў, патрэбных для абслугоўвання гэтага званка, "
 "не ўсталявана на гэтым камп'ютары"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3491,161 +3331,213 @@ msgstr ""
 "\">паведаміце аб гэтай хібе ў праграме</a> і прычапіце журнальны вывад з "
 "акенца \"Адладка\" ў меню \"Дапамога\"."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "У рухавіку званкоў узнікла памылка"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Дасягнуты канец струменя"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Не ўдалося распачаць аўдыяструменяванне"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Не ўдалося распачаць відэаструменяванне"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Аўдыя"
+msgid "_Call"
+msgstr "_Званок"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Дэкадавальны кодэк:"
+msgid "_Microphone"
+msgstr "_Мікрафон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Выключыць відэакамеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Паказаць панэль набору"
+msgid "_Settings"
+msgstr "_Настройкі"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кадавальны кодэк:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Від"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Павесіць трубку"
+#: ../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 "_Дапамога"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Закончыць гэту размову"
+#: ../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 "_Змест"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Мясцовы кандыдат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Ад_ладка"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Разгарнуць мяне"
+msgid "Swap camera"
+msgstr "Памяняць камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Згарнуць мяне"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Аддалены кандыдат:"
+msgid "Maximise me"
+msgstr "Разгарнуць мяне"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Пасылаць аўдыясігнал"
+msgid "Disable camera"
+msgstr "Выключыць відэакамеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Пасылаць відэасігнал"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Павесіць трубку"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Паказаць панэль набору"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Закончыць гэту размову"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Відэазванок"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Распачаць відэазванок"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Распачаць аўдыязванок"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Памяняць камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Пераключыць перадачу аўдыясігналу"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Пераключыць перадачу відэасігналу"
+msgid "Show dialpad"
+msgstr "Паказаць панэль набору"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Невядома"
+msgid "Display the dialpad"
+msgstr "Паказаць панэль набору"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Пасылаць відэасігнал"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Відэазванок"
+msgid "Toggle video transmission"
+msgstr "Пераключыць перадачу відэасігналу"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Званок"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Пасылаць аўдыясігнал"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Змест"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Пераключыць перадачу аўдыясігналу"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Ад_ладка"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кадавальны кодэк:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Дапамога"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Невядома"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Дэкадавальны кодэк:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Мікрафон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Аддалены кандыдат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Настройкі"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Мясцовы кандыдат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Від"
+msgid "Audio"
+msgstr "Аўдыя"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрыць гэта акно?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Закрыўшы гэта акно, вы выйдзеце з %s. Вы больш не будзеце атрымліваць новых "
+"паведамленняў да паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Закрыўшы гэта акно, вы выйдзеце з %u пакоя. Вы больш не будзеце атрымліваць "
+"новых паведамленняў да паўторнага ўваходу."
+msgstr[1] ""
+"Закрыўшы гэта акно, вы выйдзеце з %u пакояў. Вы больш не будзеце атрымліваць "
+"новых паведамленняў да паўторнага ўваходу."
+msgstr[2] ""
+"Закрыўшы гэта акно, вы выйдзеце з %u пакояў. Вы больш не будзеце атрымліваць "
+"новых паведамленняў да паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Выйсці з %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Вы больш не будзеце атрымліваць новых паведамленняў з гэтага пакоя да "
+"паўторнага ўваходу."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрыць акно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Выйсці з пакоя"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3653,7 +3545,7 @@ msgstr[0] "%s (%d непрачытана)"
 msgstr[1] "%s (%d непрачытана)"
 msgstr[2] "%s (%d непрачытана)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3661,7 +3553,7 @@ msgstr[0] "%s (і яшчэ %u размова)"
 msgstr[1] "%s (і яшчэ %u размовы)"
 msgstr[2] "%s (і яшчэ %u размоў)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3669,7 +3561,7 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад інш�
 msgstr[1] "%s (%d непрачытаныя паведамленні ад іншых)"
 msgstr[2] "%s (%d непрачытаных паведамленняў ад іншых)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3677,11 +3569,11 @@ msgstr[0] "%s (%d непрачытанае паведамленне ад усі�
 msgstr[1] "%s (%d непрачытаныя паведамленні ад усіх)"
 msgstr[2] "%s (%d непрачытаных паведамленняў ад усіх)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3689,69 +3581,69 @@ msgstr[0] "Пасылка %d паведамлення"
 msgstr[1] "Пасылка %d паведамленняў"
 msgstr[2] "Пасылка %d паведамленняў"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Піша паведамленне."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Ачысціць"
+msgid "_Conversation"
+msgstr "_Размова"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Кантакт"
+msgid "C_lear"
+msgstr "_Ачысціць"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "_Уставіць смайлік"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Упадабаны пакой для групавога чату"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "_Запрасіць удзельнікаў..."
+msgid "Notify for All Messages"
+msgstr "Апавяшчаць аб усіх паведамленнях"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Пасунуць картку ў_лева"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Паказаць спіс кантактаў"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Пасунуць картку ў_права"
+msgid "Invite _Participant…"
+msgstr "_Запрасіць удзельнікаў..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Апавяшчаць аб усіх паведамленнях"
+msgid "C_ontact"
+msgstr "_Кантакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Размова"
+msgid "_Tabs"
+msgstr "_Карткі"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Адчапіць картку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Упадабаны пакой для групавога чату"
+msgid "_Previous Tab"
+msgstr "Да _папярэдняй карткі"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Да _наступнай карткі"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Да _папярэдняй карткі"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Вярнуць закрытую картку"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Паказаць спіс кантактаў"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Пасунуць картку ў_лева"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Карткі"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Пасунуць картку ў_права"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Вярнуць закрытую картку"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Адчапіць картку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3765,100 +3657,100 @@ msgstr "Пакой"
 msgid "Auto-Connect"
 msgstr "Аўтаматычнае злучэнне"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Кіраванне спісам упадабаных пакояў для групавога чату"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Уваходны відэазванок"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Уваходны званок"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s просіць відэаразмовы. Адкажаце?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s·просіць размовы. Адкажаце?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "Уваходны званок ад %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Скінуць"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Адказаць"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Адказаць з відэа"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Уваходны відэазванок ад %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Запрашэнне ў пакой для групавога чату"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Запрашэнне ў %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Удзельнік %s запрашае вас далучыцца да %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Адмовіцца"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Прыняць запрашэнне"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "Удзельнік %s запрасіў вас у %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Вас запрасілі ў %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Уваходны файл ад %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Патрэбны пароль"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s просіць дазволу на прагляд вашага сеткавага стану"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3979,7 +3871,11 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Вычысціць закончаныя, скасаваныя і няўдалыя перадачы файлаў з гэтага спіса"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "І_мпартаваць"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3987,170 +3883,185 @@ msgstr ""
 "Не ўдалося адшукаць конты для імпартавання. Empathy пакуль падтрымлівае "
 "імпартаванне толькі для праграмы Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Імпартаванне контаў"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Імпартаванне"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Крыніца"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Адлучыцца"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Каб убачыць кантакты, трэба настроіць конт."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Адпаведнікаў не знойдзена"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "На жаль, пакуль вы не абновіце апраграмаванне %2$s, немагчыма будзе "
 "карыстацца контамі %1$s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Абнавіць апраграмаванне..."
 
-#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрыць"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Перазлучыцца"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Змяніць настройкі конта"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Папоўніць %s (%s)..."
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Папоўніць грашовы баланс конта"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Папоўніць..."
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Кантакт"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Каб убачыць кантакты, трэба ўключыць які-небудзь конт."
+
+#. 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 "Каб убачыць кантакты, трэба ўключыць %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Спіс кантактаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Кантакты на карце"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Настройкі конта"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Грашовы баланс конта"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Новая размова..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Пошук у спісе кантактаў"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Новы _званок..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Далучыцца да ўпадабаных пакояў"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Пошук кантактаў..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Настройка спіса ўпадабаных пакояў"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Перадача _файлаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Звычайны памер акна"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Паказваць _кантакты па-за сеткай"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Новы _званок..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_Паказваць інфармацыю аб пратаколе"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Звычайны памер акна з _аватарамі"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Грашовы баланс конта"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Кантакты на карце"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Конты"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Блакіраваныя кантакты"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Настройкі"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_Паказваць інфармацыю аб пратаколе"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Пошук у спісе кантактаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Сартаваць паводле і_мёнаў"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Сартаваць паводле с_тану"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Конты"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Звычайны памер акна з _аватарамі"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Блакіраваныя кантакты"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_Звычайны памер акна"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Кампактны памер акна"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Перадача _файлаў"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Пак_ой"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Далучыцца..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Новая размова..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Паказваць _кантакты па-за сеткай"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Асабістыя звесткі"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Пак_ой"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Далучыцца да ўпадабаных пакояў"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Пошук кантактаў..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Настройка спіса ўпадабаных пакояў"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4162,7 +4073,7 @@ msgstr "Удзельнікі"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4175,22 +4086,27 @@ msgstr ""
 "Патрабуецца пароль: %s\n"
 "Удзельнікі: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Не"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Не ўдалося атрымаць спіс пакояў"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Не ўдалося спыніць атрыманне спіса пакояў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Не ўдалося загрузіць спіс пакояў"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Увайсці ў пакой"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4200,6 +4116,10 @@ msgstr ""
 "пакояў са спіса."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Пак_ой:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4207,18 +4127,14 @@ msgstr ""
 "Упішыце назву сервера, які змяшчае пакой, або пакіньце графу пустой, калі ён "
 "змяшчаецца на галоўным серверы конта"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Увайсці ў пакой"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Не ўдалося загрузіць спіс пакояў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Спіс пакояў"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Пак_ой:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Атрыманне паведамлення"
@@ -4232,7 +4148,7 @@ msgid "New conversation"
 msgstr "Новая размова"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Уваход кантакту ў сетку"
 
 #: ../src/empathy-preferences.c:170
@@ -4252,327 +4168,357 @@ msgid "Language"
 msgstr "Мова"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Марыся"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Грышка"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ах, Грышка, нядобры! Як ты спалохаў мяне, гневаюся не жартам!.."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Гневаешся? Няпраўда! А чаму ж ты на мяне так міленька пазіраеш?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 "Так, са злосці!.. Дзе ты забаўляўся? Гэта ж зараз прыйдуць бацькі, а мы так "
 "многа маем з табою перагаварыць."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 "Выбачай, − чуць золак, я з'ездзіў ужо да места, кінуўся ў ногі асэсару і "
 "прасіў, каб ён узяў нас пад сваю апеку."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Трэба было завезці які гасцінчык."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Удзельнік Марыся цяпер па-за сеткай"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Настройкі"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Паказваць выявы _замест смайлікаў"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Паказваць спіс кантактаў у пакоях"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Выгляд"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Паводзіны"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Адкрываць чат у:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Матыў аздаблення чату:"
+msgid "new ta_bs"
+msgstr "новай _картцы"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Выключаць апавяшчэнні ў рэжыме _адсутнасці ці занятасці"
+msgid "new _windows"
+msgstr "новым _акне"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Выключыць гукавыя сігналы ў рэжыме _адсутнасці ці занятасці"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Паказваць уваходныя паведамленні ў абшары апавяшчэнняў"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Аўтаматычна злучацца пры запуску"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Фільтрацыя рэха дапамагае палепшыць якасць гучання вашага голасу для "
-"суразмоўцы, але можа выклікаць на некаторых камп'ютарах пэўныя праблемы. "
-"Калі вы ці ваш суразмоўца падчас размовы чуеце дзіўны шум ці шчаўчкі, "
-"паспрабуйце выключыць фільтрацыю рэха і паўтарыць званок."
+msgid "Log conversations"
+msgstr "Весці журнал размоў"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Апавяшчаць, калі кантакт уваходзіць у сетку"
+msgid "Behavior"
+msgstr "Паводзіны"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Апавяшчаць, калі кантакт выходзіць з сеткі"
+msgid "General"
+msgstr "Агульнае"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Апавяшчаць, калі акно _чату не мае фокусу"
+msgid "_Enable bubble notifications"
+msgstr "_Уключыць апавяшчэнні ў вынасках"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Правяраць арфаграфію для наступных моў:"
+msgid "Disable notifications when _away or busy"
+msgstr "Выключаць апавяшчэнні ў рэжыме _адсутнасці ці занятасці"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Агульнае"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Апавяшчаць, калі акно _чату не мае фокусу"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Апавяшчаць, калі кантакт уваходзіць у сетку"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Крыніцы даных аб месцазнаходжанні:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Апавяшчаць, калі кантакт выходзіць з сеткі"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Весці журнал размоў"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Апавяшчэнні"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Агучваць апавяшчэнні"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Агучваць падзеі"
+msgid "Disable sounds when _away or busy"
+msgstr "Выключыць гукавыя сігналы ў рэжыме _адсутнасці ці занятасці"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Прыватнасць"
+msgid "Play sound for events"
+msgstr "Агучваць падзеі"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Пагоршаная дакладнасць даных аб месцазнаходжанні азначае, што публікавацца "
-"будуць толькі даныя аб горадзе, штаце і краіне вашага месцазнаходжання. GPS-"
-"каардынаты будуць акруглены да 1 знака пасля коскі."
+msgid "Sounds"
+msgstr "Гукі"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Паказваць выявы _замест смайлікаў"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_Ужыць фільтрацыю рэха для паляпшэння якасці гучання званкоў"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "_Паказваць спіс кантактаў у пакоях"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Гукі"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Праверка арфаграфіі"
+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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Фільтрацыя рэха дапамагае палепшыць якасць гучання вашага голасу для "
+"суразмоўцы, але можа выклікаць на некаторых камп'ютарах пэўныя праблемы. "
+"Калі вы ці ваш суразмоўца падчас размовы чуеце дзіўны шум ці шчаўчкі, "
+"паспрабуйце выключыць фільтрацыю рэха і паўтарыць званок."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Спіс моў паказвае толькі мовы, для якіх вы маеце ўсталяваныя слоўнікі."
+msgid "_Publish location to my contacts"
+msgstr "_Паведамляць маім кантактам аб месцазнаходжанні"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Матывы"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_Ужыць фільтрацыю рэха для паляпшэння якасці гучання званкоў"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"Пагоршаная дакладнасць даных аб месцазнаходжанні азначае, што публікавацца "
+"будуць толькі даныя аб горадзе, штаце і краіне вашага месцазнаходжання. GPS-"
+"каардынаты будуць акруглены да 1 знака пасля коскі."
 
+#. 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 "Variant:"
-msgstr "Варыянт:"
+msgid "_Reduce location accuracy"
+msgstr "Па_гаршаць дакладнасць месцазнаходжання"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_Аўтаматычна злучацца пры запуску"
+msgid "Privacy"
+msgstr "Прыватнасць"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Мабільны тэлефон"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Уключыць апавяшчэнні ў вынасках"
+msgid "_Cellphone"
+msgstr "_Мабільны тэлефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Агучваць апавяшчэнні"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Сетка (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Крыніцы даных аб месцазнаходжанні:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Адкрываць новыя размовы ў асобных вокнах"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Спіс моў паказвае толькі мовы, для якіх вы маеце ўсталяваныя слоўнікі."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Паведамляць маім кантактам аб месцазнаходжанні"
+msgid "Enable spell checking for languages:"
+msgstr "Правяраць арфаграфію для наступных моў:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Праверка арфаграфіі"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "Па_гаршаць дакладнасць месцазнаходжання"
+msgid "Chat Th_eme:"
+msgstr "_Матыў аздаблення чату:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Варыянт:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Матывы"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Выйсці"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Зноў пазваніць кантакту"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Выключыць камеру"
+msgid "Redial"
+msgstr "Перазваніць"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Уключыць камеру"
+msgid "V_ideo"
+msgstr "_Відэа"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Выключыць відэа"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Выключыць відэакамеру і спыніць перадачу відэасігналу"
+msgid "Video Preview"
+msgstr "Папярэдні агляд відэа"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Уключыць відэакамеру і пачаць перадачу відэасігналу"
+msgid "Video On"
+msgstr "Уключыць відэа"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Уключыць відэакамеру, але не пачынаць перадачу відэасігналу"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Яшчэ раз пазваніць кантакту"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Папярэдні агляд"
+msgid "Camera Off"
+msgstr "Выключыць камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Перазваніць"
+msgid "Disable camera and stop sending video"
+msgstr "Выключыць камеру і перастаць пасылаць відэасігнал"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Відэа"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Папярэдні агляд"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Выключыць відэа"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Уключыць камеру, але не пасылаць відэасігнал"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Уключыць відэа"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Уключыць камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Папярэдні відэаагляд"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Уключыць камеру і пасылаць відэасігнал"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Прагляд карты кантактаў"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Захаваць"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Спасылка pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Адказ pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Надта шмат даных для адной устаўкі. Замест гэтага захавайце журнал у файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Акно адладкі"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Паслаць як pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Узровень "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Адладка"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Інфармацыя"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Папярэджанне"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Крытычная памылка"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Памылка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Час"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Дамен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Катэгорыя"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Узровень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4592,38 +4538,34 @@ msgstr "Выберыце кантакт, каб запрасіць яго да �
 msgid "Invite"
 msgstr "Запрасіць"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Не паказваць дыялогавых акенцаў; выканаць працу (напрыклад, імпартаванне) і "
 "выйсці"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Не паказваць дыялогавых акенцаў, калі толькі не існуе іншых контаў акрамя "
 "\"Людзей паблізу\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Спачатку вылучыць азначаны конт (напрыклад, \"gabble/jabber/"
 "foo_40example_2eorg0\")"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ідэнтыфікатар-конта>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Паказаць памочніка контаў"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Конты Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Конты Empathy"
 
@@ -4639,47 +4581,47 @@ msgstr "- Адладчык Empathy"
 msgid "Empathy Debugger"
 msgstr "Адладчык Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Кліент чату Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Адказаць"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Скінуць"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Адказаць"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Адказаць з відэа"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Адмовіцца"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прыняць"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Падаць пароль"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
@@ -4687,38 +4629,38 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "і"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "У чаканні"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Абязгучана"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Працягласць"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d хв"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Бягучы баланс: %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Вам не стае грошай, каб выканаць гэты званок."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Папоўніць"
 
@@ -4726,6 +4668,33 @@ msgstr "Папоўніць"
 msgid "_Match case"
 msgstr "_Улічваць рэгістр літар"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Тып вашага конта для чату"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Стварэнне новага конта"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Людзі паблізу"
+
+#: ../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."
+msgstr ""
+"Empathy умее аўтаматычна вышукваць і арганізоўваць чат з людзьмі, якія "
+"карыстаюцца вашай сеткай. Калі вы хочаце выкарыстаць гэту магчымасць, "
+"праверце правільнасць настроек, пададзеных ніжэй."
+
+#: ../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 ""
+"Пазней можна будзе змяніць гэтыя настройкі або наогул выключыць гэту "
+"функцыю, выбраўшы <span style=\"italic\">Праўка → Конты</span> ў спісе "
+"кантактаў."
diff --git a/po/bg.po b/po/bg.po
index 31d73e329..a92e0db19 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,10 +1,10 @@
 # Bulgarian translation of empathy po-file.
-# Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Copyright (C) 2010 Damyan Ivanov
 # Copyright (C) 2011 Krasimir Chonov
 # This file is distributed under the same license as the empathy package.
 # Yasen Pramatarov <yasen@lindeas.com>, 2004.
-# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010, 2011.
+# Alexander Shopov <ash@kambanaria.org>, 2007, 2008, 2009, 2010, 2011, 2012.
 # Yavor Doganov <yavor@gnu.org>, 2009.
 # Damyan Ivanov <dam+gnome@ktnx.net>, 2010, 2011.
 # Krasimir Chonov <mk2616@abv.bg>, 2011.
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-15 10:04+0300\n"
-"PO-Revision-Date: 2011-10-15 10:04+0300\n"
-"Last-Translator: Krasimir Chonov <mk2616@abv.bg>\n"
+"POT-Creation-Date: 2012-03-12 20:25+0200\n"
+"PO-Revision-Date: 2012-03-12 20:25+0200\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -24,523 +24,580 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Разговори чрез Google Talk, Фейсбук, MSN и много други услуги за моментни "
-"съобщения"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Клиент за моментни съобщения"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Моментни съобщения с Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Клиент за моментни съобщения"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Разговори чрез Google Talk, Фейсбук, MSN и много други услуги за моментни "
+"съобщения"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Съобщения и телефония"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление на регистрациите за съобщения и телефония през Интернет"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Новите разговори да се отварят в отделни прозорци."
+msgid "Connection managers should be used"
+msgstr "Да се използва управление на връзката"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Сила на звука при повикване"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Дали да се използват програми за управление на връзките за автоматичното им "
+"прекъсване и възстановяване."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Сила на звука при повикване в проценти."
+msgid "Empathy should auto-connect on startup"
+msgstr "Автоматично свързване при стартиране"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Уеб камера"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Дали Empathy автоматично да включва регистрациите ви при стартиране."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Позиция на камерата"
+msgid "Empathy should auto-away when idle"
+msgstr "Автоматично преминаване в състояние „Отсъстващ“ при бездействие"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Знак, който да се добави след псевдонима при ползване на дописване на "
-"псевдоними (с табулатор) в прозореца за групови разговори."
+"Дали Empathy автоматично да преминава в състояние „Отсъстващ“ при "
+"бездействие на потребителя."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Графична тема за прозореца за разговори"
+msgid "Empathy default download folder"
+msgstr "Стандартна папка за получените файлове от Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Графична тема за прозореца за разговори"
+msgid "The default folder to save file transfers in."
+msgstr "Стандартната папка, в която да се запазват получените файлове."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Списък от двубуквените съкращения на езиците с проверка за правопис "
-"разделени със запетая (напр. „bg, en, ru“)."
+"Магическо число дали да се изпълнят задачите по изчистване на настройките до "
+"нормално положение"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Стегнат списък с контакти"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c използва това число, за да реши дали да се "
+"изпълнят задачите по изчистване на настройките до нормално положение. "
+"Потребителите не трябва да променят този ключ ръчно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Да се използва управление на връзката"
+msgid "Show offline contacts"
+msgstr "Показване на контактите, които не са в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Критерий за подредбата на списъка с контактите"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr ""
+"Дали контактите, които в момента не са включени да се показват в списъка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
+msgid "Show avatars"
+msgstr "Показване на аватари"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Стандартна уеб камера за видео разговори, например /dev/video0."
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Дали да се показват аватари в списъците за контакти и прозорците за "
+"разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Default directory to select an avatar image from"
-msgstr "Стандартна папка, в която да се търсят изображения за аватари"
+msgid "Show protocols"
+msgstr "Показване на протокола"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable popup notifications when away"
-msgstr "Без известяване с изскачащи прозорци в състояние „Отсъстващ“"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Дали да се показват протоколите в списъците за контакти."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Disable sounds when away"
-msgstr "Без звуци звуци в състояние „Отсъстващ“"
+msgid "Show Balance in contact list"
+msgstr "Показване на кредита в списъка с контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Display incoming events in the status area"
-msgstr "Показване на входящи събития в областта за състоянието"
+msgid "Whether to show account balances in the contact list."
+msgstr ""
+"Дали да се показва оставащият кредит на регистрацията в списъка за контакти."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Показване на входящите събития в областта за състоянието. Ако е лъжа, "
-"събитията се представят незабавно на потребителя."
+msgid "Compact contact list"
+msgstr "Стегнат списък с контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Echo cancellation support"
-msgstr "Премахване на ехо"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Дали да се ползва стегнат изглед за списъка с контактите."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can publish the user's location"
-msgstr "Empathy може да публикува местоположението на потребителя"
+msgid "Hide main window"
+msgstr "Скриване на основния прозорец"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy може да ползва GPS, за да отгатне местоположението"
+msgid "Hide the main window."
+msgstr "Скриване на основния прозорец."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy може да използва мобилна телефонна мрежа, за да отгатне "
-"местоположението"
+msgid "Default directory to select an avatar image from"
+msgstr "Стандартна папка, в която да се търсят изображения за аватари"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy може да ползва мрежата, за да отгатне местоположението"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Последната папка, от която е взето изображение за аватар."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy default download folder"
-msgstr "Стандартна папка за получените файлове от Empathy"
+msgid "Open new chats in separate windows"
+msgstr "Отваряне на разговорите в отделни прозорци"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Автоматично преминаване в състояние „Отсъстващ“ при бездействие"
+msgid "Always open a separate chat window for new chats."
+msgstr "Новите разговори да се отварят в отделни прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Автоматично свързване при стартиране"
+msgid "Display incoming events in the status area"
+msgstr "Показване на входящи събития в областта за състоянието"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Намаляване на точността на местоположението"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Показване на входящите събития в областта за състоянието. Ако е лъжа, "
+"събитията се представят незабавно на потребителя."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
+msgid "The position for the chat window side pane"
+msgstr "Разположение на страничната лента в прозореца за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Включване на инструментите за разработка на WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"Запомненото разположение (в пиксели) на страничната лента в прозореца за "
+"разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Известяване с изскачащи прозорци при нови съобщения"
+msgid "Show contact groups"
+msgstr "Показване на групите с контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Да се ползва проверка на правописа"
+msgid "Whether to show groups in the contact list."
+msgstr "Дали да се показват групите в списъка за контакти."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Скриване на основния прозорец"
+msgid "Contact list sort criterion"
+msgstr "Критерий за подредбата на списъка с контактите"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Скриване на основния прозорец."
+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 ""
+"Кой критерий да се използва за подредбата на списъка с контактите. "
+"Стандартната стойност е „state“ — подреждане по състояние.  Стойност „name“ "
+"сменя на подредба по име."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Last account selected in Join Room dialog"
-msgstr ""
+msgid "Use notification sounds"
+msgstr "Известяване със звуци"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Nick completed character"
-msgstr "Знак за дописване на псевдоними"
+msgid "Whether to play a sound to notify of events."
+msgstr "Дали събитията да се известяват със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Open new chats in separate windows"
-msgstr "Отваряне на разговорите в отделни прозорци"
+msgid "Disable sounds when away"
+msgstr "Без звуци звуци в състояние „Отсъстващ“"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use"
-msgstr "Път до темата на Adium, която да се ползва"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Дали в състояние „Зает“ или „Отсъстващ“ да се известява със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Път до темата на Adium, която да се ползва, ако темата за разговори е Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Известяване със звук при пристигане на съобщение"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for new conversations"
-msgstr "Известяване със звук при нов разговор"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Дали пристигането на съобщения да се известява със звук."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Известяване със звук при изпращане на съобщение"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Дали изпращането на съобщения да се известява със звук."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs in"
-msgstr "Известяване със звук при влизане на контакт в мрежата"
+msgid "Play a sound for new conversations"
+msgstr "Известяване със звук при нов разговор"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when a contact logs out"
-msgstr "Известяване със звук при излизане на контакт от мрежата"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Дали новите разговори да се известяват със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log in"
-msgstr "Известяване със звук при влизането ви в мрежата"
+msgid "Play a sound when a contact logs in"
+msgstr "Известяване със звук при влизане на контакт в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Play a sound when we log out"
-msgstr "Известяване със звук при излизането ви от мрежата"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Дали влизането на контакти в мрежата да се известява със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Известяване с изскачащи прозорци, когато разговорът не е на фокус"
+msgid "Play a sound when a contact logs out"
+msgstr "Известяване със звук при излизане на контакт от мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs in"
-msgstr "Известяване с изскачащи прозорци, когато контакт влезе в мрежата"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Дали излизането на контакти от мрежата да се известява със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Pop up notifications when a contact logs out"
-msgstr "Известяване с изскачащи прозорци, когато контакт излезе извън мрежата"
+msgid "Play a sound when we log in"
+msgstr "Известяване със звук при влизането ви в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Position the camera preview should be during a call."
-msgstr ""
-"Позиционирането на изображението от камерата да става по време на разговор."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Дали влизането ви в мрежата да се известява със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show Balance in contact list"
-msgstr "Показване на кредита в списъка с контакти"
+msgid "Play a sound when we log out"
+msgstr "Известяване със звук при излизането ви от мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show avatars"
-msgstr "Показване на аватари"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Дали излизането ви от мрежата да се известява със звук."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show contact list in rooms"
-msgstr "Показване на списъка с контакти в стаите"
+msgid "Enable popup notifications for new messages"
+msgstr "Известяване с изскачащи прозорци при нови съобщения"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show hint about closing the main window"
-msgstr "Подсказване за затварянето на основния прозорец"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Дали получаването на ново съобщение да се известява с изскачащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show offline contacts"
-msgstr "Показване на контактите, които не са в мрежата"
+msgid "Disable popup notifications when away"
+msgstr "Без известяване с изскачащи прозорци в състояние „Отсъстващ“"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Show protocols"
-msgstr "Показване на протокола"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Дали в състояние „Зает“ или „Отсъстващ“ да се известява с изскачащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Spell checking languages"
-msgstr "Езици с проверка на правописа"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Известяване с изскачащи прозорци, когато разговорът не е на фокус"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The default folder to save file transfers in."
-msgstr "Стандартната папка, в която да се запазват получените файлове."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Дали получаването на ново съобщение, когато отвореният прозорец за разговори "
+"не е на фокус, да се известява с изскачащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Последната папка, от която е взето изображение за аватар."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Известяване с изскачащи прозорци, когато контакт влезе в мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The position for the chat window side pane"
-msgstr "Разположение на страничната лента в прозореца за разговори"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Дали влизането на контакт в мрежата да се известява с изскачащи прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"Запомненото разположение (в пиксели) на страничната лента в прозореца за "
-"разговори."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Известяване с изскачащи прозорци, когато контакт излезе извън мрежата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Графичната тема за прозорците за разговори."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Дали излизането на контакт извън мрежата да се известява с изскачащи "
+"прозорци."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Графичната тема за прозорците за разговори."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Изображения за емотикони"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Дали емотиконите да се преобразуват от ASCII в картинки."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use notification sounds"
-msgstr "Известяване със звуци"
+msgid "Show contact list in rooms"
+msgstr "Показване на списъка с контакти в стаите"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Use theme for chat rooms"
-msgstr "Графична тема за прозорците за разговори"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Дали списъкът с контакти да се показва в стаите за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Дали Empathy да публикува местоположението на потребителя към контактите."
+msgid "Chat window theme"
+msgstr "Графична тема за прозореца за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Дали Empathy да използва GPS за изчисляване на местоположението."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Графичната тема за прозорците за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Дали Empathy да използва мрежа за мобилни телефони за изчисляване на "
-"местоположението."
+msgid "Chat window theme variant"
+msgstr "Графична тема за прозореца за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Дали Empathy да използва мрежата за изчисляване на местоположението."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Графичната тема за прозорците за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Дали Empathy автоматично да включва регистрациите ви при стартиране."
+msgid "Path of the Adium theme to use"
+msgstr "Път до темата на Adium, която да се ползва"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Дали Empathy автоматично да преминава в състояние „Отсъстващ“ при "
-"бездействие на потребителя."
+"Път до темата на Adium, която да се ползва, ако темата за разговори е Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Дали Empathy да намалява точността на местоположението, за да защитава "
-"личните данни."
+msgid "Enable WebKit Developer Tools"
+msgstr "Включване на инструментите за разработка на WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Дали Empathy да ползва аватара на контакта за икона на прозореца за "
-"разговори."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Дали инструментите към WebKit за разработка (напр. уеб инспекторът) да се "
 "включат."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Информиране на другите участници, че им пишете"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Дали да се използват програми за управление на връзките за автоматичното им "
-"прекъсване и възстановяване."
+"Дали да се изпращат състояния „Пишещ“ или „Спрял“. За момента те не се "
+"пращат, когато основното състояние е „Отсъстващ“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Дали да се прави проверка на правописа на въведения текст спрямо избраните "
-"езици."
+msgid "Use theme for chat rooms"
+msgstr "Графична тема за прозорците за разговори"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Дали емотиконите да се преобразуват от ASCII в картинки."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Дали да се ползва графична тема за стаите за разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Дали да се използва филтърът за премахване на шумове в Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Езици с проверка на правописа"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Дали влизането на контакти в мрежата да се известява със звук."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Списък от двубуквените съкращения на езиците с проверка за правопис "
+"разделени със запетая (напр. „bg, en, ru“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Дали излизането на контакти от мрежата да се известява със звук."
+msgid "Enable spell checker"
+msgstr "Да се ползва проверка на правописа"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Дали събитията да се известяват със звук."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Дали да се прави проверка на правописа на въведения текст спрямо избраните "
+"езици."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Дали пристигането на съобщения да се известява със звук."
+msgid "Nick completed character"
+msgstr "Знак за дописване на псевдоними"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Дали новите разговори да се известяват със звук."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак, който да се добави след псевдонима при ползване на дописване на "
+"псевдоними (с табулатор) в прозореца за групови разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Дали изпращането на съобщения да се известява със звук."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Иконата на прозореца за разговори да е аватарът на контакта"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Дали влизането ви в мрежата да се известява със звук."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Дали Empathy да ползва аватара на контакта за икона на прозореца за "
+"разговори."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Дали излизането ви от мрежата да се известява със звук."
+msgid "Last account selected in Join Room dialog"
+msgstr "Последната регистрация използвана в прозореца „Влизане в стая“"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Дали в състояние „Зает“ или „Отсъстващ“ да се известява със звук."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Път до обекта в D-Bus на последната регистрация, използвана за влизане в "
+"стая."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Дали излизането на контакт извън мрежата да се известява с изскачащи "
-"прозорци."
+msgid "Camera device"
+msgstr "Уеб камера"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Дали влизането на контакт в мрежата да се известява с изскачащи прозорци."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Стандартна уеб камера за видео разговори, например /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Дали получаването на ново съобщение, когато отвореният прозорец за разговори "
-"не е на фокус, да се известява с изскачащи прозорци."
+msgid "Camera position"
+msgstr "Позиция на камерата"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Position the camera preview should be during a call."
 msgstr ""
-"Дали получаването на ново съобщение да се известява с изскачащи прозорци."
+"Позиционирането на изображението от камерата да става по време на разговор."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
-"Дали да се показва оставащият кредит на регистрацията в списъка за контакти."
+msgid "Echo cancellation support"
+msgstr "Премахване на ехо"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Дали да се показват аватари в списъците за контакти и прозорците за "
-"разговори."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Дали да се използва филтърът за премахване на шумове в Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"Дали контактите, които в момента не са включени да се показват в списъка."
+msgid "Show hint about closing the main window"
+msgstr "Подсказване за затварянето на основния прозорец"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Дали в състояние „Зает“ или „Отсъстващ“ да се известява с изскачащи прозорци."
+"Дали да се показва съобщение за затварянето на основния прозорец при "
+"натискане на бутона „×“ в заглавната лента."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Дали да се показват протоколите в списъците за контакти."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy може да публикува местоположението на потребителя"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Дали списъкът с контакти да се показва в стаите за разговори."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Дали Empathy да публикува местоположението на потребителя към контактите."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Дали да се ползва стегнат изглед за списъка с контактите."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy може да ползва мрежата, за да отгатне местоположението"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Дали да се показва съобщение за затварянето на основния прозорец при "
-"натискане на бутона „×“ в заглавната лента."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Дали Empathy да използва мрежата за изчисляване на местоположението."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Дали да се ползва графична тема за стаите за разговори."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+"Empathy може да използва мобилна телефонна мрежа, за да отгатне "
+"местоположението"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Дали Empathy да използва мрежа за мобилни телефони за изчисляване на "
+"местоположението."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy може да ползва GPS, за да отгатне местоположението"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Дали Empathy да използва GPS за изчисляване на местоположението."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Намаляване на точността на местоположението"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Кой критерий да се използва за подредбата на списъка с контактите. "
-"Стандартната стойност е „name“ — подредба по име. Стойност „state“ означава "
-"подреждане по състояние."
+"Дали Empathy да намалява точността на местоположението, за да защитава "
+"личните данни."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управление на регистрациите за съобщения и телефония през Интернет"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Не е указана причина"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Съобщения и телефония"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Заявена бе промяна в състоянието"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Преустановихте прехвърлянето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Отсрещната страна преустанови прехвърлянето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Грешка по време на прехвърлянето на файл"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Отсрещната страна не може да прехвърля файл"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Неизвестна причина"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Прехвърлянето на файл завърши, но файлът е повреден"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Отдалеченият контакт не поддържа прехвърляне на файлове"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Избраният файл не е обикновен файл"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Избраният файл е празен"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропуснато повикване от %s"
@@ -556,170 +613,138 @@ msgstr "%s ви потърси"
 msgid "Call from %s"
 msgstr "Повикване от %s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "Този вид гнездо не се поддържа"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "Не е указана причина"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "Заявена бе промяна в състоянието"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "Преустановихте прехвърлянето на файл"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "Отсрещната страна преустанови прехвърлянето на файл"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "Грешка по време на прехвърлянето на файл"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "Отсрещната страна не може да прехвърля файл"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Неизвестна причина"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "На линия"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зает"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Отсъстващ"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Извън мрежата"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Не е указана причина"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Състоянието е „Извън мрежата“."
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:75
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Мрежова грешка"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Неуспешно идентифициране"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Грешка в шифрирането"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Името е заето"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Не е предоставен сертификат"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификатът не е доверен"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификатът е изтекъл"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификатът не е влязъл в сила"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Несъвпадение на името с това в сертификата"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Несъвпадение на отпечатъка на сертификата"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификатът е самоподписан"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Грешка в сертификата"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Не е налично шифриране"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертификатът е неправилен"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Връзката е отказана"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Не може да се установи връзка"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Връзката прекъсна"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ресурсът вече е свързан към сървъра"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Регистрацията вече е свързана към сървъра"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Връзката бе заместена от нова връзка, използваща същия ресурс"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "На сървъра вече има регистрация с такова име."
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "В момента сървърът е твърде натоварен, за да обработи заявката за свързване"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификатът е анулиран"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификатът използва несигурен шифър или слаб алгоритъм за шифриране"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -727,289 +752,279 @@ msgstr ""
 "Дължината на сертификата на сървъра или дълбочината на сертификационната му "
 "верига надхвърля ограниченията на криптографската библиотека"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
-msgstr ""
+msgstr "Софтуерът ви е прекалено остарял"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Вътрешна грешка"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Хора наблизо"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! от Япония"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
 # Би трябвало транслитерирания вариант „Фейсбук“ да е наложен вече
 # според http://www.ivosiromahov.com/2_article/a46.html.
 # Иво Сиромахов като лингвистичен трендсетър, мали, мали!
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Разговор във Фейсбук"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "преди %d секунда"
 msgstr[1] "преди %d секунди"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "преди %d минута"
 msgstr[1] "преди %d минути"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "преди %d час"
 msgstr[1] "преди %d часа"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "преди %d ден"
 msgstr[1] "преди %d дни"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "преди %d седмица"
 msgstr[1] "преди %d седмици"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "преди %d месец"
 msgstr[1] "преди %d месеца"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в бъдеще"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Паролата не е открита"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Парола за %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Парола за стая за разговор „%s“ на регистрацията %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Всички регистрации"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Регистрация"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Парола"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сървър"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Моите уеб регистрации"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Регистрацията %s се редактира чрез %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Регистрацията %s не може да се редактира в Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Стартиране на „Моите уеб регистрации“"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Редактиране на %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Потребителско име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Прилагане"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Включване в мрежата"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Вече има регистрация с такова име на сървъра."
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Създаване на нова регистрация на сървъра"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "_Отказ"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Регистрация в %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Нова регистрация"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> МоетоИме"
+#: ../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:"
+msgstr "П_арола:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Допълнителни"
+msgid "Screen _Name:"
+msgstr "_Псевдоним:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> МоетоИме"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "П_арола:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомняне"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомняне"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Запомняне"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Псевдоним:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сървър:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Каква е паролата ви за AIM?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Допълнителни"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Какво е името ви в мрежата на AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Каква е паролата ви за AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сървър:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> потребителско_име"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомняне"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_Идентификатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> потребителско_име"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Какъв е идентификаторът ви в GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Каква е паролата ви в GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "И_дентификатор за ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Кодиране:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "И_дентификатор за ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Какъв е идентификаторът ви за ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Каква е паролата ви за ICQ?"
 
@@ -1046,11 +1061,23 @@ msgstr "Настройки"
 msgid "None"
 msgstr "Без"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Мрежа"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Мрежа:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Кодиране:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Сървъри"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1058,14 +1085,6 @@ msgstr ""
 "Повечето IRC сървъри нямат нужда от парола, така че ако не сте сигурни, не "
 "въвеждайте парола."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Мрежа"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Мрежа:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Псевдоним:"
@@ -1082,48 +1101,20 @@ msgstr "Съобщение при напускане:"
 msgid "Real name:"
 msgstr "Истинско име:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Сървъри"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Какво е името ви в мрежата за IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Коя мрежа за IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> потребител@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> потребител@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Задължително шифрриране (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Пренебрегване на грешките в сертификата за SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Използване на собствените настройки"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Пр_иоритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Какво е името ви в мрежата за IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Ресурс:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Какво е името ви във Фейсбук?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1137,183 +1128,207 @@ msgstr ""
 "Ако нямате такова име във Фейсбук, създайте си чрез <a href=\"http://www."
 "facebook.com/username/\">тази страница</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Използване на _стар SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Каква е паролата ви във Фейсбук?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Какво е името ви във Фейсбук?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Какъв е идентификаторът ви в Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> потребител@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Каква е паролата ви в Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> потребител@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Пренебрегване на грешките в сертификата за SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Пр_иоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Ресурс:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Задължително шифрриране (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Използване на _стар SSL"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Използване на собствените настройки"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Какъв е идентификаторът ви за Джабър?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Каква е паролата ви за Джабър?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Какъв е желаният от вас идентификатор за Джабър?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Каква е паролата ви за Джабър?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Каква е желаната от вас парола за Джабър?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> потребител@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Какъв е идентификаторът ви Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Каква е паролата ви за Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Адрес на _е-поща:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Псевдо_ним:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Фамилно име:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Лично име:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Име за п_убликуване:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Ид_ентификатор за Джабър:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Фамилно име:"
+msgid "E-_mail address:"
+msgstr "Адрес на _е-поща:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Име за п_убликуване:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Потребителско _име:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> потребител@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Потребителско име:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Откриване на свързването"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Автоматично откриване на сървъра за STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Използване на тази регистрация за прове_ждане на разговори с наземни и "
+"мобилни мрежи"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Игнориране на TLS грешки"
+msgid "NAT Traversal Options"
+msgstr "Настройки за преминаването през NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Интервал [сек.]"
+msgid "Proxy Options"
+msgstr "Сървър-посредник"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Настройки на поддържането на връзката"
+msgid "Miscellaneous Options"
+msgstr "Допълнителни настройки"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Свободна маршрутизация"
+msgid "STUN Server:"
+msgstr "Сървър за STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизъм:"
+msgid "Discover the STUN server automatically"
+msgstr "Автоматично откриване на сървъра за STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Допълнителни настройки"
+msgid "Discover Binding"
+msgstr "Откриване на свързването"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Настройки за преминаването през NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сървър:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Настройки на поддържането на връзката"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизъм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Сървър-посредник"
+msgid "Interval (seconds)"
+msgstr "Интервал [сек.]"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Потребителско име:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Транспорт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сървър за STUN:"
+msgid "Loose Routing"
+msgstr "Свободна маршрутизация"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Сървър:"
+msgid "Ignore TLS Errors"
+msgstr "Игнориране на TLS грешки"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Транспорт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"Използване на тази регистрация за прове_ждане на разговори с наземни и "
-"мобилни мрежи"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Каква е паролата ви за SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Какво е потребителското ви име за SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Потребителско _име:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Каква е паролата ви за SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "И_дентификатор на Yahoo:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr ""
 "_Да не се обръща внимание на поканите за конферентни разговори и стаи за "
 "разговори"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локал на списъка със стаи:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Какъв е идентификаторът ви в Yahoo?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Каква е паролата ви в Yahoo?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "И_дентификатор на Yahoo:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локал на списъка със стаи:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1351,67 +1366,67 @@ msgstr "Всички файлове"
 msgid "Click to enlarge"
 msgstr "Натиснете за увеличаване"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Възникна грешка при започването на разговор."
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Избраният контакт не поддържа повиквания"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Избраният контакт е извън линия"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Избраният контакт е неправилен"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "С този протокол не могат да се провеждат разговори за спешни случаи"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
-msgstr ""
+msgstr "Нямате достатъчно кредит, за да извършите това обаждане"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Неуспешно започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "В този разговор не се поддържа тема"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Нямате право да смените темата"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "„%s“ не е правилно име на контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: изчистване на всички съобщения в текущия разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: задаване на темата на текущия разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr ""
 "/join <идентификатор на стая за разговор>: влизане в нова стая за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr ""
 "/j <идентификатор на стая за разговор>: влизане в нова стая за разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1419,26 +1434,26 @@ msgstr ""
 "/part [<идентификатор на стая за разговор>] [<причина>]: напускане на стая, "
 "по подразбиране текущата"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <идентификатор на контакт> [<съобщение>]: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr ""
 "/msg <идентификатор на контакт> <съобщение>: започване на личен разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <прякор>: смяна на прякора ви за текущия сървър"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <съобщение>: изпращане на съобщение „за действие“ в текущия разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1448,11 +1463,11 @@ msgstr ""
 "при съобщения започващи с „/“. Напр.: „/say /join се използва за влизане в "
 "нова стая за разговор“"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <контакт>: показва информация за контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1460,121 +1475,128 @@ msgstr ""
 "/help [<команда>]: показване на всички поддържани команди. Ако има такава "
 "<команда>, се показва нейната употреба."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Употреба: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Неизвестна команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr ""
 "Неизвестна команда. Пробвайте с „/help“ — ще се изведат поддържаните команди"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "недостатъчен кредит за изпращане на съобщението"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Грешка при изпращането на съобщението „%s“: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Грешка при изпращането на съобщението: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
-msgstr "недостатъчен кредит за изпращане на съобщението"
+msgstr ""
+"недостатъчен кредит за изпращане на съобщението. <a href='%s'>Захранване</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "липсва такава възможност"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "изключен"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "грешен контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "липсват права"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "прекалено дълго съобщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "не е реализирано"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "неизвестна грешка"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Темата вече е: „%s“"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s смени темата на „%s“"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Не е зададена тема"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(няма предложения)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добавяне на „%s“ към речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добавяне на „%s“ към речника %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Вмъкване на емотикон"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1843
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Изпращане"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2373
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Предложения за правопис"
 
-#: ../libempathy-gtk/empathy-chat.c:2462
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Неуспех при получаването на предишните разговори"
 
-#: ../libempathy-gtk/empathy-chat.c:2599
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s прекъсна връзката"
@@ -1582,12 +1604,12 @@ msgstr "%s прекъсна връзката"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s бе изритан от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s бе изритан"
@@ -1595,17 +1617,17 @@ msgstr "%s бе изритан"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2617
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s бе поставен под възбрана от %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s бе поставен под възбрана"
 
-#: ../libempathy-gtk/empathy-chat.c:2624
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s излезе от стаята"
@@ -1615,17 +1637,17 @@ msgstr "%s излезе от стаята"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2633
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2658
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s влезе в стаята"
 
-#: ../libempathy-gtk/empathy-chat.c:2683
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s в момента е познат като %s"
@@ -1633,90 +1655,90 @@ msgstr "%s в момента е познат като %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:2836
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1546
-#: ../src/empathy-call-window.c:1596 ../src/empathy-call-window.c:2642
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3482
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Искате ли паролата да се запомни?"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Запомняне"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Не сега"
 
-#: ../libempathy-gtk/empathy-chat.c:3542
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Нов опит"
 
-#: ../libempathy-gtk/empathy-chat.c:3546
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Паролата е грешна, пробвайте отново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3676
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Стаята изисква парола:"
 
-#: ../libempathy-gtk/empathy-chat.c:3703
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
-msgstr "Присъединяване"
+msgstr "Влизане"
 
-#: ../libempathy-gtk/empathy-chat.c:3891 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../libempathy-gtk/empathy-chat.c:3946
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3951
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Непознат или неправилен идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:432
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирането на контакт временно е недостъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Блокирането на контакт е недостъпно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:436
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Достъпът е отказан"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:440
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Контактът не може да се блокира"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:783
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Редактиране на блокирани контакти"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Регистрация:"
 
@@ -1726,335 +1748,189 @@ msgstr "Блокирани контакти"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Изтриване"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Копиране на адреса"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отваряне на адреса"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%d.%m.%Y, %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Редактиране на данните за контакта"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Лични данни"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Нов контакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блокиране на „%s“?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Сигурни ли сте, че искате да забраните на „%s“ да се свързва с вас?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блокиране"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Докладване на този контакт за злоупотреба"
 msgstr[1] "_Докладване на тези контакти за злоупотреба"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Отлагане на _решението"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Искане за записване"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блокиране"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1935
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Сигурни ли сте, че искате да изтриете групата „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1937
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "Изтриване на група"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-contact-list-view.c:2063
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-msgid "_Remove"
-msgstr "_Изтриване"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2016
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Сигурни ли сте, че искате да изтриете контакта „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2018
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "Изтриване на контакт"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Добавяне на контакт…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:292
-msgid "_Block Contact"
-msgstr "_Блокиране на контакта"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:321
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-#: ../libempathy-gtk/empathy-individual-menu.c:850
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Аудио разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:386
-#: ../libempathy-gtk/empathy-individual-menu.c:895
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Видео разговор"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:432
-#: ../libempathy-gtk/empathy-individual-menu.c:948
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Предишни разговори"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:454
-#: ../libempathy-gtk/empathy-individual-menu.c:989
-msgid "Send File"
-msgstr "Изпращане на файл"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:477
-#: ../libempathy-gtk/empathy-individual-menu.c:1031
-msgid "Share My Desktop"
-msgstr "Споделяне на работното място"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:506
-#: ../libempathy-gtk/empathy-individual-menu.c:1094
-msgid "Infor_mation"
-msgstr "_Данни за контакта"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:552
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Редактиране"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:606
-#: ../libempathy-gtk/empathy-individual-menu.c:1285
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Получена е покана за тази стая"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:637
-#: ../libempathy-gtk/empathy-individual-menu.c:1331
-msgid "_Invite to Chat Room"
-msgstr "Изпращане на _покана за стаята"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Отлагане на _решението"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Търсене на контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Контакт:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Добавяне на контакт"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Няма намерени контакти"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Съобщение с което се представяте:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 "Позволете ми да виждам когато сте на линия. Благодаря!\n"
 "Please let me see when you're online. Thanks!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Пълно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Телефонен номер:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Адрес на е-поща:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Уебсайт:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Рожден ден:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Последно видян:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Свързан от:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Съобщение при напускане:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Код на държавата по ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Държава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Щат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Област:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Пощенски код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Сграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Етаж:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Текст:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Адрес в Интернет:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Ниво на точност:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Вертикална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Хоризонтална грешка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Скорост:"
 
@@ -2062,120 +1938,184 @@ msgstr "Скорост:"
 # дадената позиция.  От друга страна, пеленг може би е прекалено тясно
 # терминологично в сферата на морската/въздушната навигация.
 # Пеленг става
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Пеленг:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Скорост на изкачване:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Последно обновяване на:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Дължина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Широчина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Височина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Местоположение"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y в %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Запазване на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Неуспех при запазването на аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1066
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Любимо"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Лични данни"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Местоположение</b> на (дата)\t"
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Подробни данни за контакта"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Псевдоним:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Пълно име"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Данни за клиента"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Телефонен номер"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Клиент:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Адрес на е-поща"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Подробни данни за контакта"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Уебсайт"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Рожден ден"
+
+#. 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 "Последно видян:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Свързан от:"
+
+#. 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 "Съобщение при напускане:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "работен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "домашен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "мобилен"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "гласови"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "предпочитан"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "пощенски"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "за доставка"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Псевдоним:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Местоположение</b> на (дата)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Пратена е заявка за информация…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Данни за клиента"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Версия:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Клиент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групи"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2183,105 +2123,171 @@ msgstr ""
 "Изберете групите, в които контактът да се появява. Можете да изберете 0 или "
 "повече групи."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Добавяне на група"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Избор"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1967
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следният контакт ще бъде блокиран:"
 msgstr[1] "Следните контакти ще бъдат блокирани:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следният контакт не може да бъде блокирана:"
 msgstr[1] "Следните контакти не могат да бъдат блокирани:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Свързани контакти"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Изберете контакти за свързване"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Преглед на нов контакт"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Избраните контакти от списъка вляво ще бъдат свързани."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Редактиране на данните за контакта"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Изберете регистрация за провеждане на разговора"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Разговор"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобилен"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Зает"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "НАЧАЛО"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:805
-#: ../libempathy-gtk/empathy-new-message-dialog.c:295
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Блокиране на контакта"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Разговор"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1143
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Аудио разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Видео разговор"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Предишни разговори"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Изпращане на файл"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Споделяне на работното място"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Любимо"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Пакетът gnome-contacts не е инсталиран"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Инсталирайте пакета „gnome-contacts“, за да достъпите данните на контакта."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Данни за контакта"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Промяна"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1169
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Свързване на контакти…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Получена е покана за тази стая"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Изпращане на _покана за стаята"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Добавяне на контакт…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Изтриване и _блокиране"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Сигурни ли сте, че искате да изтриете групата „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Изтриване на група"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Изтриване"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Сигурни ли сте, че искате да изтриете контакта „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2290,7 +2296,11 @@ msgstr ""
 "Наистина ли искате да изтриете събирателния контакт „%s“? Всички контакти, "
 "които имат връзка с него, ще бъдат също изтрити."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Изтриване на контакт"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2301,23 +2311,23 @@ msgstr[1] "Събирателен контакт, съдържащ %u конта
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Местоположение</b> на (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "В мрежата през телефон или мобилно устройство"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Нова мрежа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Избор на мрежа за IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Изчистване на _списъка с мрежи"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Избор"
@@ -2330,299 +2340,251 @@ msgstr "нов сървър"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Свързване на контакти"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Разделяне…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Раздробяване на събирателния контакт на съдържаните в него контакти."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Свързване"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Да се раздели ли събирателният контакт „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Сигурни ли сте, че искате да раздробите този събирателен контакт? Действието "
-"ще раздели отделните контакти, които го съставляват."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Разделяне"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "История"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Показване"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Търсене"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Разговор в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Разговор с %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%e %B %Y, %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s секунда"
 msgstr[1] "%s секунди"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s минута"
 msgstr[1] "%s минути"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Разговорът продължи %s, приключи в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Днес"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "По всяко време"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Всеки"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Кой"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Кога"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Всичко"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Текстови разговори"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Разговори"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Входящи повиквания"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Изходящи повиквания"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропуснати повиквания"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Какво"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Сигурни ли сте, че искате да изтриете хронологията?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Изчистване"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Изтриване от:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Зареждане…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Разговор"
+#: ../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 "Р_едактиране"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Изтриване на историята…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профил"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Разговор"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Р_едактиране"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "стр. 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Идентификатор:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Зареждане…</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:77
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
-msgstr "Избраният контакт е извън линия"
+msgstr "Контактът е извън линия"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:79
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
-msgstr "Избраният контакт е неправилен"
+msgstr "Избраният контакт е неправилен или непознат"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
-msgstr "В този разговор не се поддържа тема"
+msgstr "Контактът не поддържа този тип разговор"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
-msgstr ""
+msgstr "Тази функционалност не се поддържа от реализацията на протокола"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
-msgstr ""
+msgstr "Не може да се започне разговор с този контакт"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:91
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
-msgstr ""
+msgstr "Забранено ви е да влизате в този контакт"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:93
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
-msgstr ""
+msgstr "Каналът е пълен"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
-msgstr "Канят ви да се присъедините към %s"
+msgstr "За да влезете в този канал, трябва да бъдете поканени"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "Контактът не е в мрежата"
+msgstr "Командата не може да се изпълни, когато не сте свързани"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
-msgstr "липсват права"
+msgstr "Достъпът е отказан"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
-msgstr "Възникна грешка при започването на разговор."
+msgstr "Възникна грешка при започването на разговор"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:305
-msgid "C_hat"
-msgstr "_Разговор"
+#: ../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 "Въведете идентификатор на контакт или телефонен номер:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:324
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Нов разговор"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Изпращане на _видео"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Видео разговор"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Разговор"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Аудио разговор"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Нов разговор"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Неуспешно идентифициране за регистрацията <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"
@@ -2659,12 +2621,8 @@ msgstr "Натиснете, за да направите това състоян
 msgid "Set status"
 msgstr "Задаване на състояние"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Задайте присъствието и текущото си състояние"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Други съобщения…"
 
@@ -2672,7 +2630,7 @@ msgstr "Други съобщения…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Нова регистрация в %s"
@@ -2682,20 +2640,20 @@ msgid "Find:"
 msgstr "Търсене:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Зачита_не на главни/малки"
+msgid "_Previous"
+msgstr "_Предишен"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фразата не е открита"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Следващ"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Зачита_не на главни/малки"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Предишен"
+msgid "Phrase not found"
+msgstr "Фразата не е открита"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2741,12 +2699,12 @@ msgstr "Аудио разговорът завърши"
 msgid "Edit Custom Messages"
 msgstr "Редактиране на други съобщения"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1044
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Редактирано в %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1749
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Нормално"
 
@@ -2823,43 +2781,47 @@ msgid "Certificate hostname: %s"
 msgstr "Име на хост в сертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продължаване"
+msgid "C_ontinue"
+msgstr "_Продължаване"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Недоверена връзка"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Връзката не е надеждна. Желаете ли да продължите въпреки това?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомняне на избора за бъдещи връзки"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Информация за сертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1738
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Адресът не може да бъде отворен"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1835
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Избор на файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1907
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Недостатъчно свободно място за запазване на файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1915
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"За запазването на файла са необхоими %s, но свободни са едва %s. Изберете "
+"За запазването на файла са необходими %s, но свободни са едва %s. Изберете "
 "друго местоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1959
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Входящ файл от %s"
@@ -3031,31 +2993,31 @@ msgstr "западен"
 msgid "Vietnamese"
 msgstr "виетнамски"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Липсва съобщение за грешка"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Бързо съобщение (Empathy)"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Без автоматично свързване при стартиране"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Без показване на списъка с контакти и други прозорци при стартиране"
 
-#: ../src/empathy.c:453
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— моментни съобщения с Empathy"
 
-#: ../src/empathy.c:640
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при свързване с управлението на регистрации"
 
-#: ../src/empathy.c:642
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3101,11 +3063,11 @@ msgstr ""
 "заедно с тази програма. Ако не сте, пишете до Free Software Foundation, "
 "Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Програма за моментни съобщения за GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Ясен Праматаров <yasen@lindeas.com>\n"
@@ -3118,226 +3080,84 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Възникна грешка при внасянето на регистрации."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Възникна грешка при анализирането на данните на регистрацията."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Възникна грешка при създаване на регистрацията."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Възникна грешка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Съобщението за грешка бе: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Може да се върнете назад и да опитате да въведете данните за регистрацията "
-"наново или да излезете от този помощник и да добавите регистрациите по-късно "
-"от менюто „Редактиране“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Възникна грешка"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Какъв вид регистрация имате?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Имате ли някакви други регистрации, които искате да настроите?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Въведете данните за регистрацията ви"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Какъв вид регистрация искате да създадете?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Искате ли да създадете друг вид регистрации?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Въведете данните за новата регистрация"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Чрез Empathy може да разговаряте с хора от локалната ви мрежа, приятели и "
-"колеги ползващи Google Talk, AIM, Windows Live и много други програми за "
-"разговор. С микрофон или уеб-камера може да провеждате и аудио/видео "
-"разговори."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Имате ли регистрация, която сте ползвали с друга програма за разговори?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Да, да се внесат данните за регистрацията ми от "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, ще въведа данните за регистрацията ми сега"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Не, искам нова регистрация"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Не, засега искам просто да виждам хората в локалната мрежа"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Изберете регистрациите за внасяне:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Не, това е всичко засега"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy може автоматично да открива и хората, които са свързани в същата "
-"мрежа като вас, и да започва разговор с тях. Ако искате да ползвате тази "
-"възможност, проверете дали настройките отдолу са верни. Можете да ги "
-"промените по-късно, както и да изключите изцяло тази възможност от прозореца "
-"„Регистрации“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Редактиране→Регистрации"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_Не, засега тази възможност да не се включва"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Няма да може да разговаряте с хората свързани към локалната ви мрежа, защото "
-"пакетът telepathy-salut не е инсталиран. За да включите тази възможност, "
-"инсталирайте пакета и създайте регистрация „Хора наблизо“ в прозореца за "
-"регистрации."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Пакетът telepathy-salut не е инсталиран"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Помощник за съобщения и телефония през Интернет"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Добре дошли в Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Внасяне на съществуващи регистрации"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Въведете още информация"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Има незапазени промени относно регистрацията ви в %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Регистрацията ви все още не е запазена."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1330
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Свързване…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Извън мрежата — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Изключен — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Извън мрежата — липсва връзка"
 
 # FIXME: термини за offine и disconnected
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Неизвестно състояние"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Тази регистрация използва старо и неподдържано ядро, затова е изключена. "
+"Инсталирайте пакета „telepathy-haze“ и рестартирайте програмата, за да "
+"мигрирате рeгистрацията."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Извън мрежата — регистрацията е изключена"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"На път сте да създадете нова регистрация, което ще анулира\n"
-"промените ви. Искате ли да продължите?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Редактиране на настройките на връзката"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Личните ви данни не могат да бъдат изтеглени от сървъра."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Влезте в мрежата, за да редактирате личните си данни."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Редактиране на настройките на връзката…"
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Сигурни ли сте, че искате да изтриете регистрацията „%s“?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Това няма да изтрие регистрацията ви от сървъра."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3346,15 +3166,23 @@ msgstr ""
 "промените ви. Искате ли да продължите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Включване"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Изключване"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Прескачане"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Свързване"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3366,19 +3194,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Добавяне…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Зареждане на данните за контакта"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Не е инсталиран протокол"
+msgid "_Import…"
+msgstr "_Внасяне…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Зареждане на данните за контакта"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3386,125 +3210,116 @@ msgstr ""
 "За да добавите нова регистрация, трябва да имате модул, който поддържа "
 "нейния протокол."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Внасяне…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Не са инсталирани модулите за поддръжка на този протокол"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — идентифициране с Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Идентифициране с Empathy"
 
-# FIXME: Това е връзка чрез mDNS/DNS-SD, сиреч Avahi.  „Хора наблизо“ е
-# доста объркващо, защото контакти от локалната мрежа не е задължително
-# да са наблизо, както и контакти от други мрежи може да са съвсем
-# наблизо.
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Хора наблизо"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " — телефонна/видео връзка с Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Телефонна/видео връзка с Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Контраст"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Яркост"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
-msgstr "Гама корекция"
+msgstr "Гама"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Сила на звука"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Странична лента"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
-msgstr "Аудио вход"
+msgstr "Входящ звук"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
-msgstr "Видео вход"
+msgstr "Входящо видео"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Циферблат"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
-msgstr "Подробности"
+msgstr "Подробна информация"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1939
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор с %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2183
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Местен адрес, както се вижда оттук"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2185
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Местен адрес, както се вижда от сървър в Интернет"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Адрес на отсрещната страна, както се вижда оттам"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2189
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Адрес на препредаващия сървър"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2191
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Адрес на групата за разпръскване (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
-#: ../src/empathy-streamed-media-window.c:1849
-#: ../src/empathy-streamed-media-window.c:1852
-#, fuzzy
 msgctxt "codec"
 msgid "Unknown"
-msgstr "Неизвестно"
+msgstr "Неизвестен"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr "Връзка — %d:%02dm"
+msgstr "Връзка от %d:%02dм"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2961
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Технически данни"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2999
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3513,8 +3328,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от аудио форматите, поддържани на вашия "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3004
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3523,8 +3338,8 @@ msgstr ""
 "Софтуерът на %s не поддържа никой от видео форматите, поддържани на вашия "
 "компютър"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3010
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3533,29 +3348,29 @@ msgstr ""
 "Не може да се осъществи връзка с %s, чиято мрежа, вероятно, не поддържа "
 "преки връзки."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:3016
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Мрежова грешка"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:3020
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за аудио форматите, изисквани за този разговор, не са инсталирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:3023
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Програмите за видео форматите, изисквани за този разговор, не са инсталирани "
 "на компютъра ви"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3035
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3566,262 +3381,311 @@ msgstr ""
 "\">докладвайте този проблем</a> и прикачете журналните файлове указани в "
 "прозореца „Изчистване на грешки“ от менюто „Помощ“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:3044
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Грешка в модула за разговори"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:3047
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Достигнат е краят на потока"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:3087
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Потокът на аудио връзката не може да бъде осъществен"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:3097
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Потокът на видео връзката не може да бъде осъществен"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Звук"
+msgid "_Call"
+msgstr "_Разговор"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Декодиращ модул:"
+msgid "_Microphone"
+msgstr "_Микрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Спиране на камерата"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Циферблат"
+msgid "_Settings"
+msgstr "_Настройки"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодиращ модул:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Преглед"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Затваряне"
+#: ../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 "Помо_щ"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Затваряне на текущия разговор"
+#: ../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 "_Ръководство"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Местен кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Изчистване на грешки"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Уголемяване"
+msgid "Swap camera"
+msgstr "Размяна на камерата"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Смаляване"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Отдалечен кандидат:"
+msgid "Maximise me"
+msgstr "Уголемяване"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Изпращане на аудио"
+msgid "Disable camera"
+msgstr "Спиране на камерата"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Изпращане на видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Затваряне"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Циферблат"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Затваряне на текущия разговор"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видео разговор"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Провеждане на видео разговор"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Провеждане на аудио разговор"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Размяна на камерата"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Превключване на пращането на аудио"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Превключване на пращането на видео"
+msgid "Show dialpad"
+msgstr "Циферблат"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2591 ../src/empathy-call-window.c:2592
-#: ../src/empathy-call-window.c:2593 ../src/empathy-call-window.c:2594
-msgid "Unknown"
-msgstr "Неизвестно"
+msgid "Display the dialpad"
+msgstr "Циферблат"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Изпращане на видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видео разговор"
+msgid "Toggle video transmission"
+msgstr "Превключване на пращането на видео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Разговор"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Изпращане на аудио"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Ръководство"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Превключване на пращането на аудио"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Изчистване на грешки"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодиращ модул:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Помо_щ"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Неизвестно"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Декодиращ модул:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Микрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Отдалечен кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Настройки"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Местен кандидат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Преглед"
+msgid "Audio"
+msgstr "Звук"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Да се затвори ли този прозорец?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Ако затворите този прозорец, ще напуснете %s. Няма да получавате други "
+"съобщения докато не влезете отново."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Ако затворите този прозорец, ще напуснете стаята. Няма да получавате други "
+"съобщения докато не влезете отново в нея."
+msgstr[1] ""
+"Ако затворите този прозорец, ще напуснете %u стаи. Няма да получавате други "
+"съобщения докато не влезете отново в тях."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Излизане от %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Няма да получавате други съобщения от тази стая, докато не влезете отново в "
+"нея."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Затваряне на прозореца"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Излизане от стаята"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d непрочетено)"
 msgstr[1] "%s (%d непрочетени)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (и %u друго)"
 msgstr[1] "%s (и %u други)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d непрочетено от други)"
 msgstr[1] "%s (%d непрочетени от други)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d непрочетено от всички)"
 msgstr[1] "%s (%d непрочетени от всички)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Изпращане на %d съобщение"
 msgstr[1] "Изпращане на %d съобщения"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Пише съобщение."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Изчистване на прозореца"
+msgid "_Conversation"
+msgstr "_Разговор"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Контакт"
+msgid "C_lear"
+msgstr "_Изчистване на прозореца"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "_Вмъкване на емотикон"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Любима стая за разговор"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Поканване на _участник…"
+msgid "Notify for All Messages"
+msgstr "Известяване за всички съобщения"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Преместване на подпрозореца на_ляво"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Показване на списъка с контакти"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Преместване на подпрозореца на_дясно"
+msgid "Invite _Participant…"
+msgstr "Поканване на _участник…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Известяване за всички съобщения"
+msgid "C_ontact"
+msgstr "_Контакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Разговор"
+msgid "_Tabs"
+msgstr "_Подпрозорци"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Отделяне на подпрозореца"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Любима стая за разговор"
+msgid "_Previous Tab"
+msgstr "_Предишен подпрозорец"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Следващ подпрозорец"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Предишен подпрозорец"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Отмяна на затварянето на подпрозорец"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Показване на списъка с контакти"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Преместване на подпрозореца на_ляво"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Подпрозорци"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Преместване на подпрозореца на_дясно"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Отмяна на затварянето на подпрозорец"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Отделяне на подпрозореца"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3835,100 +3699,100 @@ msgstr "Стая"
 msgid "Auto-Connect"
 msgstr "Автоматично свързване"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Управление на стаите в отметките"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Входящ видео разговор"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1563
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Входящ разговор"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ви търси с видео, искате ли да отговорите?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ви търси, искате ли да отговорите?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1569
+#: ../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 "Входящ разговор от %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "От_казване"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Отговаряне"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Отговор с видео"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1569
+#: ../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 "Входящ видео разговор от %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Покана за стая"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
-msgstr "Покана за присъединяване към %s"
+msgstr "Покана за влизане в %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s ви кани да се присъедините към %s"
+msgstr "%s ви кани да влезете в %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Отказване"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
-msgstr "_Присъединяване"
+msgstr "_Влизане"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
-msgstr "%s ви кани да се присъедините към %s"
+msgstr "%s ви кани да се влезете в %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "Канят ви да се присъедините към %s"
+msgstr "Канят ви да влезете в %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Входящ файл от %s"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:378
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Парола"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s иска разрешение да вижда дали сте в мрежата"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3938,105 +3802,105 @@ msgstr ""
 "Съобщение: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u ч., %02u м. и %02u сек."
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u м. и %02u сек."
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s от общо %s, с %s/сек."
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s от общо %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Получаване на файла „%s“ от %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Изпращане на файла „%s“ до %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при получаване на „%s“ от %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Грешка при получаване на файл"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при изпращане на „%s“ до %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Грешка при изпращане на файл"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ получен от %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s“ изпратен до %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Прехвърлянето на файл завърши"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Изчакване на отговора на другия участник"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверка на целостта на „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Изчисляване на извадката на „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Файл"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Остават"
 
@@ -4050,7 +3914,11 @@ msgstr ""
 "Изчистване на завършените, отменените и неуспешните прехвърляния на файлове "
 "от списъка"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Внасяне"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4058,168 +3926,188 @@ msgstr ""
 "Не са открити регистрации за внасяне. Empathy поддържа в момента внасяне "
 "само от Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Внасяне на регистрации"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Внасяне"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Източник"
 
-#: ../src/empathy-main-window.c:395
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Паролата ви"
 
-#: ../src/empathy-main-window.c:401
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Прекъсване"
 
-#: ../src/empathy-main-window.c:642
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+"Трябва да настроите поне една регистрации, за да се появят контакти тук."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Не е намерено съвпадение"
 
-#: ../src/empathy-main-window.c:750
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
+"Регистрациите за %s няма да могат да се ползват, преди да обновите софтуера "
+"за %s."
 
-#: ../src/empathy-main-window.c:818
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
-msgstr ""
+msgstr "Обновяване на софтуера…"
 
-#: ../src/empathy-main-window.c:824 ../src/empathy-main-window.c:949
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Затваряне"
 
-#: ../src/empathy-main-window.c:937
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Ново свързване"
 
-#: ../src/empathy-main-window.c:943
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Редактиране на регистрация"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1088
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Захранване на %s (%s)…"
 
-#: ../src/empathy-main-window.c:1135
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Захранване на кредита"
 
 #. top up button
-#: ../src/empathy-main-window.c:1206
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Захранване…"
 
-#: ../src/empathy-main-window.c:1949
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../src/empathy-main-window.c:2324
-msgid "Contact List"
-msgstr "Списък с контакти"
-
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Контакти на карта"
-
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Кредит"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Трябва да включите поне една от регистрациите си, за да се появят контакти "
+"тук."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Търсене в списъка с контакти"
+#. 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 "Трябва да включите %s, за да се появят контакти тук."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Добавяне към отметките"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "Списък с контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Редактиране на отметките"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Настройки на регистрациите"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Нормален размер"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Нов разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "Нов _разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Нормален размер с _аватари"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Търсене на контакти…"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Настройки"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Прехвърляния на файлове"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Изключени контакти"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "_Показване на протокола"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Подреждане по _име"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Кредит"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Подреждане по _състояние"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Контакти на карта"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Регистрации"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Блокирани контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Стегнат режим"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_Настройки"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Прехвърляния на файлове"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Търсене в списъка с контакти"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_Присъединяване…"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Подреждане по _име"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Нов разговор…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Подреждане по _състояние"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Изключени контакти"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Нормален размер с _аватари"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Лични данни"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_Нормален размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Стегнат режим"
+
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Стая"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Търсене на контакти…"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Влизане…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Добавяне към отметките"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Редактиране на отметките"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4231,7 +4119,7 @@ msgstr "Участници"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4244,25 +4132,30 @@ msgstr ""
 "Изисква се парола: %s\n"
 "Брой участници: %s"
 
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
 # Налага се с главни букви, защото „да“ се използва в помощника за нови
 # регистрации, където има и отговори под формата на пълни изречения като
 # „Не, това е всичко засега“.
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Не"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Изброяването на стаите не може да започне"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Изброяването на стаите не може да спре"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Списъкът със стаи не може да бъде зареден"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Влизане в стая"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4272,6 +4165,10 @@ msgstr ""
 "стаи от списъка."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Стая:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4279,180 +4176,196 @@ msgstr ""
 "Попълнете сървъра, на който е стаята. Ако тя е на сървъра на текущата "
 "регистрация, оставете полето празно."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Влизане в стая"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Списъкът със стаи не може да бъде зареден"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Списък със стаи"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Стая:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Съобщението е получено"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Нов разговор"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Контактът е в мрежата"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Контактът влезе в мрежата"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Контактът е извън мрежата"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Регистрацията е включена"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Регистрацията е изключена"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Език"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Жулиета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео! О, защо си ти Ромео?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "От род и име отречи се или"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ако не щеш, любовна клетва дай ми"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "и аз не ще съм вече Капулети!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Да ѝ отвърна ли или да слушам?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Жулиета прекъсна връзката"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Настройки"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Използване на _картинки за емотикони"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Показване на контактите в стаите"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведение"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Започване на разговорите в: "
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема за прозорците за разговори:"
+msgid "new ta_bs"
+msgstr "нови по_дпрозорци"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Без _известяване в състояние „Зает“ или „Отсъстващ“"
+msgid "new _windows"
+msgstr "нови _прозорци"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Без _звуци в състояние „Зает“ или „Отсъстващ“"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показване на входящи събития в областта за уведомяване"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Автоматично свързване при стартиране"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Премахването на ехото може да изчисти гласа ви за отсрещната страна, но при "
-"някои компютри създава проблеми. Ако някой от събеседниците се оплаче, че "
-"чува странни шумове или прекъсвания по време на разговора, изключете "
-"премахването на ехото и проведете наново разговор."
+msgid "Log conversations"
+msgstr "Архив на разговорите"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Известяване, когато контактът влезе в мрежата"
+msgid "Behavior"
+msgstr "Поведение"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Известяване, когато контактът излезе извън мрежата"
+msgid "General"
+msgstr "Общи"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Известяване, когато прозорецът за разговори не е на _фокус"
+msgid "_Enable bubble notifications"
+msgstr "Включване на известяването с _прозорци"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Езици с проверка на правописа:"
+msgid "Disable notifications when _away or busy"
+msgstr "Без _известяване в състояние „Зает“ или „Отсъстващ“"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Общи"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Известяване, когато прозорецът за разговори не е на _фокус"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ниво на входящия звук:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Известяване, когато контактът влезе в мрежата"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Сила на входящия звук:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Известяване, когато контактът излезе извън мрежата"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Известяване"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Датчик за местоположение:"
+msgid "_Enable sound notifications"
+msgstr "Включване на уведомяването със _звук"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Архив на разговорите"
+msgid "Disable sounds when _away or busy"
+msgstr "Без _звуци в състояние „Зает“ или „Отсъстващ“"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Известяване"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Звуци при събития"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Звуци"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Лични данни"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Премахване на _ехото за по-добро качество"
 
 #: ../src/empathy-preferences.ui.h:23
 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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Премахването на ехото може да изчисти гласа ви за отсрещната страна, но при "
+"някои компютри създава проблеми. Ако някой от събеседниците се оплаче, че "
+"чува странни шумове или прекъсвания по време на разговора, изключете "
+"премахването на ехото и проведете наново разговор."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Публикуване на местоположението ви към контактите ви"
+
+#: ../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."
@@ -4461,198 +4374,201 @@ msgstr ""
 "точни данни от град, щат, държава. Координатите от GPS ще са точни до едно "
 "място зад десетичната запетая."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Използване на _картинки за емотикони"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "_Показване на контактите в стаите"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Звуци"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Проверка на правописа"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "В списъка са само езиците, за които е инсталиран речник."
-
+#. 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 "Themes"
-msgstr "Графични теми"
+msgid "_Reduce location accuracy"
+msgstr "_Ниска точност на местоположението"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Премахване на _ехото за по-добро качество"
+msgid "Privacy"
+msgstr "Лични данни"
 
-# Това е пеленг.  Посока е неточно, защото не е релативно спрямо
-# дадената позиция.  От друга страна, пеленг може би е прекалено тясно
-# терминологично в сферата на морската/въздушната навигация.
-# Пеленг става
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Пеленг:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "_Автоматично свързване при стартиране"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Мобилен телефон"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "Включване на известяването с _прозорци"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мрежа (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "Включване на уведомяването със _звук"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Датчик за местоположение:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "В списъка са само езиците, за които е инсталиран речник."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Мрежа (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Езици с проверка на правописа:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Отваряне на разговорите в отделни прозорци"
+msgid "Spell Checking"
+msgstr "Проверка на правописа"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Публикуване на местоположението ви към контактите ви"
+msgid "Chat Th_eme:"
+msgstr "_Тема за прозорците за разговори:"
+
+# Това е пеленг.  Посока е неточно, защото не е релативно спрямо
+# дадената позиция.  От друга страна, пеленг може би е прекалено тясно
+# терминологично в сферата на морската/въздушната навигация.
+# Пеленг става
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Пеленг:"
 
-#. 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:41
-msgid "_Reduce location accuracy"
-msgstr "_Ниска точност на местоположението"
+msgid "Themes"
+msgstr "Графични теми"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Състояние"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Спиране на програмата"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Нов разговор с контакта"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Включване на камерата"
+msgid "Redial"
+msgstr "Преизбиране"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Изключване на камерата"
+msgid "V_ideo"
+msgstr "_Видео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Без видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Изключване на камерата и пращането на видео"
+msgid "Video Preview"
+msgstr "Преглед на видеото"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Включване на камерата и пращането на видео"
+msgid "Video On"
+msgstr "С видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Включване на камерата без пращане на видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Пренабиране на контакта"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+msgid "Camera Off"
+msgstr "Изключване на камерата"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Повторно набиране"
+msgid "Disable camera and stop sending video"
+msgstr "Изключване на камерата и спиране на изпращането на видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Видео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Преглед"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Изключване на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Включване на камерата без изпращане на видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Включване на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Включване на камерата"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед на видеото"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Включване на камерата и изпращане на видео"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Карта с контактите"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Запазване"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Връзка към сайта за поставяне"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Отговор на сайта за поставяне"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Данните са прекалено големи за еднократно поставяне. Запазете журнала във "
+"файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Прозорец за изчистване на грешки"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Изпращане към сайта за поставяне"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Ниво"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Подробност"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Информация"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критична"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Област"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категория"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Ниво"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4660,173 +4576,178 @@ msgstr ""
 "Избраната програма за управление на връзките не поддържа разширението за "
 "отдалечено изчистване на грешки."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Поканване на участник"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Избор на контакт, за поканване в разговора:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Покана"
 
-#: ../src/empathy-accounts.c:184
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Без показването на прозорци. Извършване на дейност (напр. внасяне) и спиране"
 
-#: ../src/empathy-accounts.c:188
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Да не се показват прозорци, освен ако всичките регистрации са за „Хора "
 "наблизо“"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Първоначално избиране на дадена регистрация (напр. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:194
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ид-р на регистрация>"
 
-#: ../src/empathy-accounts.c:197
-#, fuzzy
-msgid "Show account assistant"
-msgstr "Показване на кредита в списъка с контакти"
-
-#: ../src/empathy-accounts.c:203
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Регистрации на Empathy"
 
-#: ../src/empathy-accounts.c:242
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Регистрации на Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Само избрана услуга"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— изчистване на грешки към Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Изчистване на грешки към Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— моментни съобщения с Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Отговаряне"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1573
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Отхвърляне"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1574
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Отговор"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Отговор с видео"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Отклоняване"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Приемане"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Въвеждане"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s току-що се опита да ви позвъни, но провеждахте друг разговор."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1183 ../src/empathy-call-window.c:1206
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "инф."
 
-#: ../src/empathy-call-window.c:2890
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Задържане"
 
-#: ../src/empathy-call-window.c:2893
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Без звук"
 
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Времетраене"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2898
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dм"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "Зачита_не на главни/малки"
-
-#~ msgid "Empathy has migrated butterfly logs"
-#~ msgstr "Empathy извърши миграция на данните от butterfly"
-
-#~ msgid "Whether Empathy has migrated butterfly logs."
-#~ msgstr ""
-#~ "Дали програмата Empathy е извършила миграция на данните от butterfly"
-
-#~ msgid "Ungrouped"
-#~ msgstr "Без група"
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Текущият ви баланс е %s."
 
-#~ msgid "Favorite People"
-#~ msgstr "Любими хора"
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Нямате достатъчно кредит, за да извършите това обаждане."
 
-#~ msgid "Select a contact"
-#~ msgstr "Избор на контакт"
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Захранване"
 
-#~ msgid "The selected contact cannot receive files."
-#~ msgstr "Избраният контакт не може да получава файлове."
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "Зачита_не на главни/малки"
 
-#~ msgid "The selected contact is offline."
-#~ msgstr "Избраният контакт е извън мрежата"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Какъв вид регистрация имате?"
 
-#~ msgctxt "encoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "Неизвестно"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Нова регистрация"
 
-#~ msgctxt "encoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "Неизвестно"
+# FIXME: Това е връзка чрез mDNS/DNS-SD, сиреч Avahi.  „Хора наблизо“ е
+# доста объркващо, защото контакти от локалната мрежа не е задължително
+# да са наблизо, както и контакти от други мрежи може да са съвсем
+# наблизо.
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Хора наблизо"
 
-#~ msgctxt "decoding video codec"
-#~ msgid "Unknown"
-#~ msgstr "Неизвестно"
+#: ../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."
+msgstr ""
+"Empathy може автоматично да открива и хората, които са свързани в същата "
+"мрежа като вас, и да започва разговор с тях. Ако искате да ползвате тази "
+"възможност, проверете дали настройките отдолу са верни."
 
-#~ msgctxt "decoding audio codec"
-#~ msgid "Unknown"
-#~ msgstr "Неизвестно"
+#: ../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 ""
+"Можете да промените тези настройки по-късно или изцяло да изключите тези "
+"възможност като изберете <span style=\"italic\">Редактиране → Регистрации</"
+"span> в списъка с контакти."
diff --git a/po/da.po b/po/da.po
index 8bbb23479..2c2f5d578 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@
 # Ole Laursen <olau@hardworking.dk>, 2003, 04, 06.
 # David Nielsen <dnielsen@breakmygentoo.net>, 2002, 06.
 # M.P. Rommedahl <lhademmor@gmail.com>, 2008.
-# Kenneth Nielsen <k.nielsen81@gmail.com>, 2009-2011.
+# Kenneth Nielsen <k.nielsen81@gmail.com>, 2009-2012.
 # Ask Hjorth Larsen <asklarsen@gmail.com>, 2010.
 #
 # Konventioner:
@@ -26,8 +26,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-16 13:32+0200\n"
-"PO-Revision-Date: 2011-09-16 13:41+0200\n"
+"POT-Creation-Date: 2012-02-20 22:56+0100\n"
+"PO-Revision-Date: 2012-02-19 19:32+0100\n"
 "Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -53,27 +53,29 @@ msgstr "Samtaleklienten Empathy"
 msgid "IM Client"
 msgstr "IM-Klient"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Håndtér konti for meddelelser og VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Konti for meddelelser og VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Åbn altid et separat chatvindue til nye chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Opkaldslydstyrke"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Opkaldslydstyrke, som en procentdel."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Kameraenhed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Kameraposition"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -81,55 +83,61 @@ msgstr ""
 "Tegn som skal tilføjes efter kaldenavn når du bliver navnefuldførelse (tab) "
 "i gruppechat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Tema for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Temavariant for chatvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaadskilt liste af sprog, der skal bruges ved stavekontrol (f.eks. \"en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Forbindelseshåndteringer bør bruges"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterium for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"D-Bus-objektstien til den sidste konto, som blev valgt til at tilslutte et "
+"rum."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Standardkameraenheden som skal bruges ved videoopkald, f.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Standardmappe at vælge profilbillede fra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Deaktivér pop op-påmindelse ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Deaktivér lyde ved fravær"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Deaktiver indkommende begivenheder i statusområde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -138,71 +146,75 @@ msgstr ""
 "brugeren med det samme hvis den er sat til falsk."
 
 # Der er en streng et andet sted som afslører at det er lydekko der menes
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Understøttelse for neutralisering af ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy må offentliggøre brugerens placering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy må bruge GPS'en til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy må bruge mobilnetværket til at gætte placeringen"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy må bruge netværket til at gætte placeringen"
 
 # Lidt klodset for at undgå at bruge download
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Standardmappe til hentede filer i Empathy"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy har konverteret butterfly-logge"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy skal automatisk sættes til fraværende ved inaktivitet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy skal autoforbinde ved start"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal reducere placeringens nøjagtighed"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy skal bruge kontaktens profilbillede som chattens vinduesikon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå WebKit-udviklingsværktøjer til"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Aktivér pop op-påmindelser for nye beskeder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Aktivér stavekontrol"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Skjul hovedvindue"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informér andre brugere om at du er ved at skrive til dem"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "Sidste konto som blev valgt i \"tilslut rum\"-dialogen"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Navnefuldførelsestegn"
@@ -272,87 +284,87 @@ msgid "Show avatars"
 msgstr "Vis profilbilleder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Vis kontaktgrupper"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Vis fif om lukning af hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Vis offline kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Stavekontrolleringssprog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "Den forvalgte mappe at gemme filoverførsler i."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den seneste mappe som et profilbillede blev valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "Positionen af chatvinduets sidepanel"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Den gemte positionen (i billedpunkter) af chatvinduets sidepanel."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Det tema der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Den temavariant der bruges ved visning af samtalen i chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Benyt grafiske tekstansigter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Benyt påmindelseslyde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Brug tema til chatrum"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Hvorvidt Empathy har lov til at offentliggøre brugerens placering overfor "
 "kontakterne."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Hvorvidt Empathy har lov til at bruge GPS til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge mobilnetværket til at gætte "
 "placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Hvorvidt Empathy har lov til at bruge netværket til at gætte placeringen."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Om Empathy har konverteret butterfly-logge."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Om Empathy automatisk skal logge ind på dine konti ved opstart."
@@ -452,14 +464,22 @@ msgstr ""
 "travlt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Hvorvidt tilstandene \"skriver\" eller \"på pause\" skal sendes. Påvirker på "
+"nuværende tidspunkt ikke \"ikke til stede\"-tilstanden."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger af."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om der skal vises pop op-påmindelser, når en kontakt logger på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -467,46 +487,50 @@ msgstr ""
 "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked, selv "
 "hvis chatten allerede er åben, men ikke er fokuseret."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om der skal vises en pop op-påmindelse ved modtagelse af en ny besked."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "Hvorvidt der skal vises kontosaldi i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Om kontakter der ikke er tilsluttet, skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Hvorvidt der skal vises grupper i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Om der skal vises pop op-påmindelser, når brugeren er fraværende eller har "
 "travlt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Om der skal vises profilbilleder for kontakter i kontaktlisten og "
 "chatvinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Hvorvidt kontaktlisten skal vises i chatrum."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Om kontaktlisten skal vises i kompakt form eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -514,43 +538,61 @@ msgstr ""
 "Om beskeddialogen om at lukke hovedvinduet med \"x\"-knappen i titelbjælken "
 "skal vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om temaet skal bruges til chatrum eller ej."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Kriteriet der bruges til at sortere kontaktlisten. Som standard sorteres "
-"efter kontaktens navn med værdien \"name\". Værdien \"state\" vil sortere "
-"kontaktlisten efter status."
+"efter kontaktens status med værdien \"state\". Er værdien \"name\", sorteres "
+"efter kontaktens navn."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Håndtér konti for meddelelser og VoIP"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ingen årsag blev angivet"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Konti for meddelelser og VoIP"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Ændringen i tilstand foregik på anmodning"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Du annullerede filoverførslen"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Den anden deltager annullerede filoverførslen"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Fejl ved forsøg på overførsel af filen"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Den anden deltager er ikke i stand til at overføre filen"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Ukendt årsag"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverførsel fuldført, men filen blev beskadiget"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverførsel understøttes ikke af fjernkontakten"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Den valgte fil er ikke en regulær fil"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Den valgte fil er tom"
 
@@ -570,173 +612,142 @@ msgstr "Ringede til %s"
 msgid "Call from %s"
 msgstr "Opkald fra %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Sokkeltype understøttet ikke"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Ingen årsag blev angivet"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Ændringen i tilstand foregik på anmodning"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Du annullerede filoverførslen"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Den anden deltager annullerede filoverførslen"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Fejl ved forsøg på overførsel af filen"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Den anden deltager er ikke i stand til at overføre filen"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Ukendt årsag"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Optaget"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ikke til stede"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen årsag angivet"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status sat til offline"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Netværksfejl"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Godkendelse mislykkedes"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfejl"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Navn i brug"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certifikat ikke givet"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certifikat utroværdigt"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certifikat udløbet"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certifikat ikke aktiveret"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certifikat-værtsnavn passer ikke"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikat-fingeraftryk passer ikke"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certifikat selv-underskrevet"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certifikatfejl"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgængelig"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certifikatet er ugyldigt"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Tilslutningen er blevet afvist"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Forbindelsen kunne ikke etableres"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Forbindelsen blev brudt"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Denne ressource er allerede forbundet til serveren"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Denne konto er allerede forbundet til serveren"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Forbindelse er blevet erstattet af en ny forbindelse, der bruger samme "
 "ressource"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontoen findes allerede på serveren"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Serveren har på nuværende tidspunkt for travlt til at håndtere forbindelsen"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certifikatet er blevet tilbagekaldt"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certifikatet bruger en usikker krypteringsalgoritme eller er kryptografisk "
 "svag"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -744,165 +755,145 @@ msgstr ""
 "Længden af servercertifikatet, eller dybden af servercertifikatkæden, "
 "overskrider krypteringsbibliotekets grænser"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+# brugen af "software" fjernet behovet for at finde ud af om der henvises til et eller flere programmer
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Din software er for gammel"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Intern fejl"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Folk i nærheden"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dage siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uge siden"
 msgstr[1] "%d uger siden"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i fremtiden"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alle Konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Adgangskode"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Mine Webkonti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Kontoen %s redigeres via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Kontoen %s kan ikke redigeres i Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Start Mine Webkonti"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Redigér %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "An_vend"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_og ind"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Denne konto findes allerede på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Opret en ny konto på serveren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Annuller"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Ny konto"
 
@@ -950,7 +941,7 @@ msgstr "Husk adgangskode"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Husk adgangskode"
 
@@ -1280,7 +1271,7 @@ msgid "STUN Server:"
 msgstr "STUN-server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Server:"
 
@@ -1324,36 +1315,36 @@ msgstr "Yahoo!-i_d:"
 msgid "_Room List locale:"
 msgstr "_Rumliste-placering:"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kunne ikke konvertere billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "Ingen af de accepterede billedformater understøttes på dit system"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Kunne ikke gemme billede til fil"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Vælg dit profilbillede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Tag et billede..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Intet billede"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Billeder"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Alle filer"
 
@@ -1362,7 +1353,7 @@ msgid "Click to enlarge"
 msgstr "Klik for at forstørre"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
 msgstr "Der opstod en fejl ved opstart af opkaldet"
 
@@ -1382,40 +1373,44 @@ msgstr "Den angivne kontakt er ikke gyldig"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødopkald er ikke understøttet med denne protokol"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "Din saldo rækker ikke til at du kan foretage dette opkald"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Kunne ikke åbne privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Emne understøttes ikke af denne samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke adgang til at ændre emnet"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” er ikke et gyldigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Ryd alle meddelelser fra den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: Angiv emnet for den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id for chatrum>: Gå ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id for chatrum>: Gå ind i et nyt chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1423,23 +1418,23 @@ msgstr ""
 "/part [<id for chatrum>] [<grund>]: Forlad chatrummet, som standard det "
 "nuværende chatrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontact-id> [<meddelelse>]: Åbn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-id> <meddelelse>: Åbn en privat chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kaldenavn>: Ændr dit kaldenavn på den aktuelle server"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelelse>: Send en handlingsmeddelelse til den aktuelle samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1449,11 +1444,11 @@ msgstr ""
 "til at sende en meddelelse, der begynder med \"/\". For eksempel: \"/say /"
 "join-kommandoen bruges til at gå ind i et nyt chatrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: viser information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1461,113 +1456,126 @@ msgstr ""
 "/help [<kommando>]: Vis alle understøttede kommandoer. Hvis <kommando> er "
 "angivet, så vis dens brugsdokumentation."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Brug: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Ukendt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukendt kommando; brug /help for at se de tilgængelige kommandoer"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "for lille saldo til at sende beskeden"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Fejl under afsendelse af besked \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Fejl under afsendelse af besked: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "utilstrækkelig saldo til at sende besked. <a href='%s'>Fyld op</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ude af stand til"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "adgang nægtet"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "for lang besked"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ikke implementeret"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Fejl under afsendelse af besked \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Fejl under afsendelse af besked: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Emne sat til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Emne sat af %s til: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Intet emne defineret"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Tilføj \"%s\" til ordbog"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Tilføj \"%s\" til ordbogen for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Indsæt tekstansigt"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Kunne ikke hente seneste logge"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s er koblet af"
@@ -1575,12 +1583,12 @@ msgstr "%s er koblet af"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s blev sparket ud af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s blev sparket ud"
@@ -1588,17 +1596,17 @@ msgstr "%s blev sparket ud"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bortvist af %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bortvist"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forladt rummet"
@@ -1608,17 +1616,17 @@ msgstr "%s har forladt rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s er kommet ind i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s har nu navnet %s"
@@ -1626,88 +1634,88 @@ msgstr "%s har nu navnet %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:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Ønsker du at gemme denne adgangskode?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ikke nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Forkert adgangskode; prøv venligst igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Dette rum beskyttes af en adgangskode:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Deltag"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Ukendt eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokering af kontakter er midlertidigt ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokering af kontakter er ikke tilgængelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Adgang nægtet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Kunne ikke blokere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Redigér blokerede kontakter"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1719,64 +1727,55 @@ msgstr "Blokerede kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Fjern"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiér linkadresse"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Åbn link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Redigér kontaktoplysninger"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personlige oplysninger"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
 "Er du sikker på at du ønsker at blokere \"%s\", så vedkommende ikke kan "
 "kontakte dig igen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokér"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Indrapportér denne kontakt som værende grov"
@@ -1794,349 +1793,268 @@ msgstr "Abonneringsanmodning"
 msgid "_Block User"
 msgstr "_Blokér bruger"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ikke grupperet"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favoritfolk"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ønsker du at fjerne gruppen \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Fjerner gruppe"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Fjern"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ønsker du at fjerne kontakten \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Fjerner kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Tilføj kontakt…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokér kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Lydopkald"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videoopkald"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Tidligere samtaler"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Send fil"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Del mit skrivebord"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favorit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Opl_ysninger"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Redigér"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviterer dig til dette rum"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_Invitér til chatrum"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Søg i kontakter"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Søg: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Tilføj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ingen kontakter fundet"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Besked til introduktion af dig selv:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Lad mig venligst se hvornår du er online. Tak!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Vælg en kontakt"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Fulde navn:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonnummer:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail-adresse:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Webside:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Fødselsdag:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Sidst set:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Tilsluttet fra:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Fraværsbesked:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaler:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Lands ISO-kode:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Land:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Tilstand:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "By:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Område:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Gade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Bygning:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Etage:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Niveau for nøjagtighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Fejl:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Lodret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vandret fejl (meter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Kurs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Stigningshastighed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Sidst opdateret den:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Længdegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Breddegrad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Højde:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Placering"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %B, %Y klokken %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gem profilbillede"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Kan ikke gemme profilbillede"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personlige detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Detaljer om kontakt"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Fulde navn"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail-adresse"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Webside"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Fødselsdag"
+
+#. 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 "Sidst set:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Tilsluttet fra:"
+
+#. 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 "Fraværsbesked:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "arbejde"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "hjemme"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "taleopkald"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "foretrukne"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "post"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "pakke"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Placering</b> den (dato)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2148,15 +2066,10 @@ msgstr "Klientoplysninger"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Detaljer om kontakt"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
@@ -2173,11 +2086,11 @@ msgstr "Styresystem:"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2185,105 +2098,171 @@ msgstr ""
 "Vælg de grupper, som du ønsker at denne skal fremgå i. Bemærk at du kan "
 "vælge mere end en gruppe eller slet ingen gruppe."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Tilf_øj gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Vælg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Følgende identitet vil blive blokeret:"
 msgstr[1] "Følgende identiteter vil blive blokeret:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Følgende identitet kan ikke blokeres:"
 msgstr[1] "Følgende identiteter kan ikke blokeres:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Sammenkædede kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Vælg kontakter som skal sammenkædes"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Forhåndsvisning af ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Redigér kontaktoplysninger"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Vælg konto der skal bruges til at lave dette opkald"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Opkald"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbejde"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HJEM"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokér kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Lydopkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videoopkald"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Tidligere samtaler"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send fil"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Del mit skrivebord"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favorit"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts er ikke installeret"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Installér venligst gnome-contacts for at kunne tilgå detaljer for kontakt."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Opl_ysninger"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redigér"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Sammenkæd kontakter…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Inviterer dig til dette rum"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Invitér til chatrum"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "_Tilføj kontakt…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Slet og _blokér"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ønsker du at fjerne gruppen \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Fjerner gruppe"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Fjern"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ønsker du at fjerne kontakten \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2292,7 +2271,11 @@ msgstr ""
 "Ønsker du virklig at fjerne denne sammenkædede kontakt \"%s\"? Bemærk at "
 "dette vil fjerne alle de kontakter, som denne sammenkædede kontakt består af."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Fjerner kontakt"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2307,19 +2290,19 @@ msgstr "<b>Placering</b> den (dato)"
 msgid "Online from a phone or mobile device"
 msgstr "Via nettet fra en telefon eller mobil enhed"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nyt netværk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Vælg et IRC-netværk"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Nulstil _netværksliste"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Vælg"
@@ -2332,182 +2315,136 @@ msgstr "ny server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Sammenkæd kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Adskil…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Split den valgte sammenkædede kontakt fuldstændigt op i de kontakter den "
-"indeholder."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Sammenkæd"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Adskil sammenkædet kontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Er du sikker på at du vil adskille disse sammenkædede kontakter? Dette vil "
-"splitte de sammenkædede kontakter fuldstændigt op i de kontakter de består "
-"af."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Adskil"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historik"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "Søg"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minut"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Opkaldet tog %s, sluttede %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "Når som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Hvornår"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Hvad som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Tekstchat"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Indkommende opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "Udgående opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "Mistede opkald"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Hvad"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Er du sikker på at du ønsker at slette alle logge fra tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "Ryd alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "Slet fra:"
 
@@ -2536,7 +2473,7 @@ msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Redigér"
 
@@ -2548,36 +2485,83 @@ msgstr "_Fil"
 msgid "page 2"
 msgstr "side 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakt-id:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakten er offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Den angivne kontakt er enten ugyldig eller ukendt"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakten understøtter ikke denne form for samtale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+"Den forespurgte funktionalitet er ikke implementeret for denne protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Kunne ikke starte en samtale med den givne kontakt"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Du er bortvist fra denne kanal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanalen er fuld"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Du skal inviteres, før du kan deltage i denne kanal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Kan ikke fortsætte i afkoblet tilstand"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Adgang nægtet"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Der opstod en fejl ved opstart af samtalen"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Indtast identifikator for kontakt eller telefonnummer:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Ny samtale"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Send _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Videoopkald"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Opkald"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Lydopkald"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Nyt opkald"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Godkendelse mislykkedes for kontoen <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"
@@ -2614,12 +2598,8 @@ msgstr "Klik for at gøre denne status til en favorit"
 msgid "Set status"
 msgstr "Sæt status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Sæt din tilstedeværelse og status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Tilpassede beskeder…"
 
@@ -2696,12 +2676,12 @@ msgstr "Stemmeopkald sluttede"
 msgid "Edit Custom Messages"
 msgstr "Redigér tilpasset besked"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Besked redigeret %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2779,34 +2759,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certifikat-værtsnavn: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsæt"
+msgid "C_ontinue"
+msgstr "F_ortsæt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Ikke-betroet forbindelse"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Forbindelsen er ikke betroet. Vil du fortsætte alligevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valg til fremtidige forbindelser"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Kan ikke åbne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Vælg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok fri plads til at gemme filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2815,7 +2799,7 @@ msgstr ""
 "%s fri plads er nødvendig for at gemme denne fil, men der er kun %s "
 "tilgængelig. Vælg venligst en anden placering."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Indkommende fil fra %s"
@@ -2987,39 +2971,31 @@ msgstr "Vestligt"
 msgid "Vietnamese"
 msgstr "Vietnamesisk"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Den valgte kontakt kan ikke modtage filer."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Den valgte kontakt er offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ingen fejlmeddelelse"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Chatbesked (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Tilslut ikke ved start"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Vis ikke kontaktlisten eller nogen andre dialoger ved opstart"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM-klient"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "Fejl ved forsøg på at kontakte kontohåndteringen"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3066,11 +3042,11 @@ msgstr ""
 "program. Hvis ikke, så skriv til Free software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "En samtaleklient til GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Ole Laursen\n"
@@ -3081,223 +3057,73 @@ msgstr ""
 "Dansk-gruppen <dansk@dansk-gruppen.dk>\n"
 "Mere info: http://www.dansk-gruppen.dk"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Der opstod en fejl ved import af kontiene."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Der opstod en fejl ved fortolkning af detaljer for kontoen."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Der opstod en fejl under oprettelse af kontoen."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Der opstod en fejl."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Fejlmeddelelsen var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Du kan enten gå tilbage og forsøge at indtaste dine kontodetaljer igen, "
-"eller afslutte denne assistent og tilføje konti senere fra Redigér-menuen."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Der opstod en fejl"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Hvilken type chatkonto ønsker du?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du andre chatkonti, du vil have indstillet?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Indtast dine kontodetaljer"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Hvilken type konto ønsker du at oprette?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Ønsker du at oprette andre chatkonti?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Indtast detaljerne for den nye konto"
-
-# Jeg tror lige vi ændrer formuleringen lidt frit, eftersom jeg ikke forstår hvad de taler om
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Med Empathy kan du chatte med folk på nettet, f.eks. venner og kolleger som "
-"bruger Google Talk, AIM, Windows Live eller mange andre chatprogrammer. Med "
-"en mikrofon eller et webkamera kan du også foretage lyd- eller videoopkald."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du en konto, som du har brugt med et andet chatprogram?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Ja, importér mine kontodetaljer fra "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jeg vil indtaste mine kontodetaljer nu"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nej, jeg vil oprette en ny konto"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"Nej, jeg vil bare tale med folk, der er tilsluttet i nærheden, indtil videre"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Vælg de konti, du vil importere:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nej, det var alt - indtil videre"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy kan automatisk finde og skrive til brugere, der er sluttet til samme "
-"netværk som dig. Hvis du vil bruge denne funktion, så kontrollér at "
-"detaljerne herunder er korrekte. Du kan let ændre disse detaljer senere, "
-"eller deaktivere denne funktion i dialogvinduet \"Konti\""
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Redigér->Konti"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Jeg vil _ikke aktivere denne funktion indtil videre"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Du vil ikke kunne skrive sammen med brugere, der er tilsluttet dit lokale "
-"netværk, da telepathy-salut ikke er installeret. Hvis du vil aktivere denne "
-"funktion, så installér venligst pakken telepathy-salut og opret en \"Folk i "
-"nærheden\"-konto fra dialogvinduet \"Konti\""
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut er ikke installeret"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistent for meddelelser og VoIP-konti"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Velkommen til Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importér dine eksisterende konti"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Indtast venligst personlige detaljer"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Der er ugemte ændringer til din %s-konto."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke blevet gemt endnu."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Forbinder…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Ikke tilsluttet — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frakoblet — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Ikke tilsluttet — Ingen netværksforbindelse"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Ukendt årsag"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Ikke tilsluttet — Konto deaktiveret"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Du er ved at oprette en ny konto, hvilket vil kassere\n"
-"dine ændringer. Er du sikker på, at du vil fortsætte?"
+#: ../src/empathy-accounts-dialog.c:533
+msgid "Edit Connection Parameters"
+msgstr "Redigér forbindelsesparametre"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Kunne ikke hente din personlige information fra serveren."
+
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "Gå på nettet for at redigere din personlige information."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "_Redigér forbindelsesparametre..."
+
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ønsker du at fjerne %s fra din computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på serveren."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3306,15 +3132,23 @@ msgstr ""
 "ændringer. Er du sikker på, at du vil fortsætte?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Aktivér"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Deaktivér"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Spring over"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "_Tilslut"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3331,14 +3165,10 @@ msgid "Loading account information"
 msgstr "Indlæser kontaktoplysninger"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ingen protokol installeret"
+msgid "No protocol backends installed"
+msgstr "Ingen protokolmoduler installeret"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3356,132 +3186,116 @@ msgstr ""
 #  _("Import"), cell,
 #  "active", COL_IMPORT,
 #  NULL); 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Importér…"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Audio/video-klienten Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Folk i nærheden"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Audio/video-klienten Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Audio/video-klienten Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Lydstyrke"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sidepanel"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Lydinput"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videoinput"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Opkaldspanel"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Detaljer"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Opkald til %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses af maskinen"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses af en server på internettet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen for modparten(peer), som den ses på den anden side"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adressen for en videresendelsesserver"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen for multicastgruppen"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ukendt"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ukendt"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Forbundet — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3489,8 +3303,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de lydformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3498,8 +3312,8 @@ msgid ""
 msgstr ""
 "%ss software forstår ingen af de videoformater, din computer understøtter"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3508,29 +3322,29 @@ msgstr ""
 "Kan ikke oprette forbindelse til %s. En af jer er måske på et netværk, der "
 "ikke tillader direkte forbindelser."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Der opstod en fejl på netværket"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformaterne, der kræves til dette opkald, er ikke installeret på din "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3541,23 +3355,23 @@ msgstr ""
 "a> venligst denne fejl og vedhæft logfiler fra fejlfindingsvinduet i menuen "
 "Hjælp."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Der opstod en fejl i opkaldsmotoren"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Afslutningen af strømmen blev nået"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan ikke oprette lydstrøm"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan ikke oprette videostrøm"
 
@@ -3648,8 +3462,8 @@ msgstr "Slå videotransmission til/fra"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -3667,17 +3481,17 @@ msgid "_Camera"
 msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Indhold"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Fejlfind"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Hjælp"
 
@@ -3690,51 +3504,100 @@ msgid "_Settings"
 msgstr "_Indstillinger"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Vis"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Luk dette vindue?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Lukkes dette vindue, vil du forlade %s. Du vil ikke modtage yderligere "
+"beskeder, før du igen deltager."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Lukkes dette vindue vil du forlade et chatrum. Du vil ikke modtage "
+"yderligere beskeder før du igen deltager."
+msgstr[1] ""
+"Lukkes dette vindue vil du forlade %u chatrum. Du vil ikke modtage "
+"yderligere beskeder før du igen deltager."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Forlad %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Du vil ikke modtage yderligere beskeder fra dette chatrum, før du igen "
+"deltager i det."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Luk vindue"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlad rum"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulæst)"
 msgstr[1] "%s (%d ulæste)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u anden)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulæst fra andre)"
 msgstr[1] "%s (%d ulæste fra andre)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulæst fra alle)"
 msgstr[1] "%s (%d ulæste fra alle)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d besked"
 msgstr[1] "Sender %d beskeder"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver en besked."
 
@@ -3814,96 +3677,96 @@ msgstr "Auto-tilslut"
 msgid "Manage Favorite Rooms"
 msgstr "Håndtér yndlingsrum"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Indkommende videoopkald"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Indkommende opkald"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s foretager et videoopkald til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer til dig! Ønsker du at besvare opkaldet?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Indkommende opkald fra %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "Af_vis"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_Besvar"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "_Besvar med video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Indkommende videoopkald fra %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Ruminvitation"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer dig til at slutte dig til %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Afslå"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:860
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Deltag"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterer dig til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du er blevet inviteret til at deltage i %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Indkommende filoverførsel fra %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Adgangskode påkrævet"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker tilladelse til at se, når du er på nettet"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3913,105 +3776,105 @@ msgstr ""
 "Besked: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s af %s med %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s af %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Modtager \"%s\" fra %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sender \"%s\" til %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Fejl ved modtagelse af \"%s\" fra %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Fejl ved modtagelse af fil"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Fejl ved afsendelse af \"%s\" til %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Fejl ved afsendelse af en fil"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" modtaget fra %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sendt til %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Filoverførsel fuldført"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Venter på den anden deltagers svar"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrollerer integritet af \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hasher \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fil"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Tilbage"
 
@@ -4024,7 +3887,21 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Fjern færdiggjorte, annullerede eller fejlslagne filoverførsler fra listen"
 
-#: ../src/empathy-import-dialog.c:84
+# Fejlrapport, (v) eller (s)
+#
+# Kode omkring streng antyder at det er verbum bydeform
+#
+#  /* Import column */
+#  cell = gtk_cell_renderer_toggle_new ();
+#  gtk_tree_view_insert_column_with_attributes (view, -1,
+#  _("Import"), cell,
+#  "active", COL_IMPORT,
+#  NULL); 
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4032,7 +3909,7 @@ msgstr ""
 "Ingen konti kunne findes til import. Empathy understøtter på nuværende "
 "tidspunkt kun at importere konti fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importér konti"
 
@@ -4047,167 +3924,193 @@ msgstr "Importér konti"
 #  "active", COL_IMPORT,
 #  NULL); 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Giv adgangskode"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Frakobl"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du skal oprette en konto for at se kontakter her."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen træffere fundet"
 
-#: ../src/empathy-main-window.c:777
+# Kildekoden antyder at begge %s er protokoller
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Beklager, %s-konti kan ikke benyttes før din %s-software er blevet opdateret."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Updatér software..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Luk"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Tilslut igen"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redigér kontoen"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Luk"
-
 # Dette er vist ikke helt efter den engelske definition som er noget med at fylde op til et bestemt niveau, men jeg synes heller ikke at udtrykket "at toppe op" har udbredelse nok til at man kan bruge det. Forslag modtages gerne.
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyld op %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyld kontosaldo op"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyld op..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Du skal aktivere en af dine konti for at kunne se kontakter her."
+
+#. 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 "Du skal aktivere %s for at kunne se kontakter her."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktliste"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontoindstillinger"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontakter på et _kort"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Kreditsaldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Find i kontakt_liste"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_Tilslut til favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Håndter favoritter"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nyt _opkald…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _profilbillede"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Indstillinger"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Vis _protokoller"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Sortér efter _navn"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Sortér efter s_tatus"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konti"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokerede kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Filoverførsler"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Deltag…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Ny samtale…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Offline kontakter"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personlige oplysninger"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "R_um"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Søg efter kontakter…"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Chatrum"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Medlemmer"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4220,16 +4123,21 @@ msgstr ""
 "Kræver adgangskode: %s\n"
 "Deltagere: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nej"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Kunne ikke starte fremvisning af rumliste"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Kunne ikke standse fremvisning af rumliste"
 
@@ -4264,84 +4172,84 @@ msgstr "Rumliste"
 msgid "_Room:"
 msgstr "R_um:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Besked modtaget"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Besked sendt"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Ny samtale"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontakten logger på"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "En kontakt logger på"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "Kontakten logger af"
+msgstr "En kontakten logger af"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konto tilsluttet"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konto frakoblet"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Sprog"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julie"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Å, Romeo, hvorfor er du Romeo?"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Fornægt din far, forkast det navn du bærer!"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Og vil du ikke, sværg så, du er min,"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "så er jeg ikke mer en Capulet!"
 
 # Forslag? Nogen der har en dansk version af Romeo og Julie?
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Skal jeg nu høre mere eller tale?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julie er koblet af"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -4401,35 +4309,27 @@ msgstr "Aktivér stavekontrol for sprog:"
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Inputniveau:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Inputlydstyrke:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Stedkilder:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Log samtaler"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Påmindelser"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Afspil lyde ved begivenheder"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privatliv"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4439,33 +4339,41 @@ msgstr ""
 "end din by, stat eller land vil blive vist. GPS-koordinater vil blive "
 "begrænset til første decimal."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Vis _smileys som billeder"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Vis kontakt_liste i rum"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Lyde"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Stavekontrol"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Start chat:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Denne liste indeholder kun sprog, som du har en ordbog installeret for."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Temaer"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Brug _ekkoneutralisering til at forbedre opkaldskvaliteten"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variant:"
@@ -4495,18 +4403,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_Netværk (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Åbn nye chats i særskilte vinduer"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Offentliggør placering til mine kontakter"
 
 #. 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:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Reducér placeringens nøjagtighed"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "nye _vinduer"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "nye fane_blade"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Status"
@@ -4563,67 +4475,67 @@ msgstr "Video slået til"
 msgid "Video Preview"
 msgstr "Forhåndsvisning for video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktkortvisning"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Gem"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Fejlfindingsvindue"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Niveau "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Fejlfind"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889 ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Besked"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Fejl"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tidspunkt"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domæne"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4631,89 +4543,89 @@ msgstr ""
 "Den valgte forbindelseshåndtering understøtter ikke udvidelsen til "
 "fjernfejlfinding."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Invitér deltager"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Vælg en kontakt, du vil invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Invitér"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Vis ikke nogen dialoger; udfør eventuelt arbejde (såsom import) og afslut"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Vis ingen dialoger med mindre der kun er \"Folk i nærheden\"-konti"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Vælg den givne konto til at starte med (f.eks. gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konti"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-konti"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Vis en bestemt tjeneste"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy-fejlfinding"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy-fejlfinding"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-samtaleklient"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Afvis"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Besvar"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Besvar med video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Afslå"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "Acceptér"
 
@@ -4724,7 +4636,7 @@ msgstr "Acceptér"
 #. 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:260
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "Giv"
 
@@ -4736,32 +4648,334 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "I kø"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Stilhed"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Varighed"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Din nuværende saldo er %s."
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Beklager, du har ikke nok på din konto til det opkald."
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "Fyld op"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Match store/små bogstaver"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Hvilken type chatkonto ønsker du?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Tilføjer ny konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Folk i nærheden"
+
+#: ../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."
+msgstr ""
+"Empathy kan automatisk finde og skrive til brugere, der er sluttet til samme "
+"netværk som dig. Hvis du vil bruge denne funktion, så kontrollér at "
+"detaljerne herunder er korrekte."
+
+#: ../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 ""
+"Du kan ændre disse detaljer senere eller slå denne funktion fra ved at vælge "
+"<span style=\"italic\">Redigér → Konti</span> i kontaktlisten."
+
+#~ msgid "Call volume"
+#~ msgstr "Opkaldslydstyrke"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Opkaldslydstyrke, som en procentdel."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy har konverteret butterfly-logge"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Om Empathy har konverteret butterfly-logge."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Sokkeltype understøttet ikke"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Mine Webkonti"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Kontoen %s redigeres via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Kontoen %s kan ikke redigeres i Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Start Mine Webkonti"
+
+#~ msgid "Edit %s"
+#~ msgstr "Redigér %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Annuller"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personlige oplysninger"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Ikke grupperet"
+
+#~ msgid "Favorite People"
+#~ msgstr "Favoritfolk"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Redigér"
+
+#~ msgid "Select a contact"
+#~ msgstr "Vælg en kontakt"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Sammenkædede kontakter"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Vælg kontakter som skal sammenkædes"
+
+#~ msgid "New contact preview"
+#~ msgstr "Forhåndsvisning af ny kontakt"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "De valgte kontakter i listen til venstre vil blive sammenkædet."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Sammenkæd kontakter…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Sammenkæd kontakter"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Adskil…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Split den valgte sammenkædede kontakt fuldstændigt op i de kontakter den "
+#~ "indeholder."
+
+#~ msgid "_Link"
+#~ msgstr "_Sammenkæd"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Adskil sammenkædet kontakt \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Er du sikker på at du vil adskille disse sammenkædede kontakter? Dette "
+#~ "vil splitte de sammenkædede kontakter fuldstændigt op i de kontakter de "
+#~ "består af."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Adskil"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakt-id:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
+
+#~ msgid "Send _Video"
+#~ msgstr "Send _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Opkald"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Sæt din tilstedeværelse og status"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Den valgte kontakt kan ikke modtage filer."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Den valgte kontakt er offline."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Der opstod en fejl ved import af kontiene."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Der opstod en fejl ved fortolkning af detaljer for kontoen."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Der opstod en fejl under oprettelse af kontoen."
+
+#~ msgid "There was an error."
+#~ msgstr "Der opstod en fejl."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Fejlmeddelelsen var: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Du kan enten gå tilbage og forsøge at indtaste dine kontodetaljer igen, "
+#~ "eller afslutte denne assistent og tilføje konti senere fra Redigér-menuen."
+
+#~ msgid "An error occurred"
+#~ msgstr "Der opstod en fejl"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Har du andre chatkonti, du vil have indstillet?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Indtast dine kontodetaljer"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Hvilken type konto ønsker du at oprette?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Ønsker du at oprette andre chatkonti?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Indtast detaljerne for den nye konto"
+
+# Jeg tror lige vi ændrer formuleringen lidt frit, eftersom jeg ikke forstår hvad de taler om
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Med Empathy kan du chatte med folk på nettet, f.eks. venner og kolleger "
+#~ "som bruger Google Talk, AIM, Windows Live eller mange andre "
+#~ "chatprogrammer. Med en mikrofon eller et webkamera kan du også foretage "
+#~ "lyd- eller videoopkald."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Har du en konto, som du har brugt med et andet chatprogram?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Ja, importér mine kontodetaljer fra "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Ja, jeg vil indtaste mine kontodetaljer nu"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nej, jeg vil oprette en ny konto"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr ""
+#~ "Nej, jeg vil bare tale med folk, der er tilsluttet i nærheden, indtil "
+#~ "videre"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Vælg de konti, du vil importere:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nej, det var alt - indtil videre"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redigér->Konti"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Jeg vil _ikke aktivere denne funktion indtil videre"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Du vil ikke kunne skrive sammen med brugere, der er tilsluttet dit lokale "
+#~ "netværk, da telepathy-salut ikke er installeret. Hvis du vil aktivere "
+#~ "denne funktion, så installér venligst pakken telepathy-salut og opret en "
+#~ "\"Folk i nærheden\"-konto fra dialogvinduet \"Konti\""
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Assistent for meddelelser og VoIP-konti"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Velkommen til Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importér dine eksisterende konti"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Indtast venligst personlige detaljer"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Du er ved at oprette en ny konto, hvilket vil kassere\n"
+#~ "dine ændringer. Er du sikker på, at du vil fortsætte?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ukendt"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personlige oplysninger"
+
+#~ msgid "Input level:"
+#~ msgstr "Inputniveau:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Inputlydstyrke:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Åbn nye chats i særskilte vinduer"
+
 #~ msgid "All"
 #~ msgstr "Alle"
 
@@ -5323,9 +5537,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Edit the groups and name for this contact"
 #~ msgstr "Indtast et navn for konto."
 
-#~ msgid "View previous conversations with this contact"
-#~ msgstr "Vis foregående samtaler"
-
 #~ msgid "<b>Languages</b>"
 #~ msgstr "<b>Sprog</b>"
 
@@ -5401,9 +5612,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "A specific protocol error occurred that was unexpected."
 #~ msgstr "En specifik protokolfejl opstod uventet."
 
-#~ msgid "Home"
-#~ msgstr "Hjemme"
-
 #~ msgid "This service is unavailable or not found"
 #~ msgstr "Denne funktion er ikke tilgængelig."
 
@@ -5478,9 +5686,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "Nogen vil gerne sende dig en fil."
 
-#~ msgid "Retry connection"
-#~ msgstr "Stop tilslutning"
-
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inviterede %s til at deltage i denne konferencesamtale."
 
@@ -5568,9 +5773,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "<b>About</b>"
 #~ msgstr "<b>Om</b>"
 
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personlige detaljer</b>"
-
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
 
@@ -5623,9 +5825,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Use system pro_xy"
 #~ msgstr "Benyt systemets _mellemvært"
 
-#~ msgid "_Connect"
-#~ msgstr "_Tilslut"
-
 #~ msgid "_Disconnect"
 #~ msgstr "_Frakobl"
 
@@ -5653,9 +5852,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "_Web site:"
 #~ msgstr "Hjemmeside:"
 
-#~ msgid "irc account settings"
-#~ msgstr "<b>Kontoindstillinger</b>"
-
 #~ msgid "msn account settings"
 #~ msgstr "<b>Kontoindstillinger</b>"
 
@@ -5768,9 +5964,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Chat Rooms..."
 #~ msgstr "Samtalerum"
 
-#~ msgid "Connection Details"
-#~ msgstr "Forbindelsesdetaljer"
-
 #~ msgid "Enter the server used in the connection for this account"
 #~ msgstr ""
 #~ "Indtast den server der bliver brugt ved tilslutning for denne konto."
@@ -5908,9 +6101,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "Gossip, Instant Messaging Client"
 #~ msgstr "Gossip, samtaleklient"
 
-#~ msgid "Close this chat window"
-#~ msgstr "Luk dette samtalerum"
-
 #~ msgid "Requested Information"
 #~ msgstr "Anmodede oplysninger"
 
@@ -6151,9 +6341,6 @@ msgstr "_Match store/små bogstaver"
 #~ msgid "<b>Preset status messages</b>"
 #~ msgstr "<b>Forvalgte statusbeskeder</b>"
 
-#~ msgid "Add Another Account"
-#~ msgstr "Tilføj en anden konto"
-
 #~ msgid "Configuring Service"
 #~ msgstr "Registeringstjeneste"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index cea232b12..2d3d810d5 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,2380 +1,4720 @@
-# Canadian English translation of gossip.
-# Copyright (C) 2004-2005 Adam Weinberger and the GNOME Foundation
-# This file is distributed under the same licence as the gossip package.
+# Canadian English translations for Empathy package.
+# Copyright (C) 2012 EMPATHY'S COPYRIGHT HOLDER
+# This file is distributed under the same licence as the Empathy package.
 # Adam Weinberger <adamw@gnome.org>, 2004, 2005.
-# 
-# 
+# Tiffany Antopolski <tiffany.antopolski@gmail.com>, 2012.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 23:46+0200\n"
-"PO-Revision-Date: 2005-08-27 20:31-0500\n"
-"Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
-"Language-Team: Canadian English <adamw@gnome.org>\n"
+"Project-Id-Version: Empathy\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-08 15:44+0000\n"
+"PO-Revision-Date: 2012-02-08 19:16-0500\n"
+"Last-Translator: Tiffany Antopolski <tiffany.antopolski@gmail.com>\n"
+"Language-Team: Canadian English\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en_CA\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/empathy.desktop.in.h:1
-#, fuzzy
-msgid "Empathy Instant Messenger"
-msgstr "Instant Messenger"
+#: ../data/empathy.desktop.in.in.h:1
+msgid "Empathy"
+msgstr "Empathy"
 
-#: ../data/empathy.desktop.in.h:2
-msgid "Instant Messenger"
-msgstr "Instant Messenger"
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
 
-#: ../data/empathy.schemas.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Empathy Internet Messaging"
 
-#: ../data/empathy.schemas.in.h:2
-msgid "Chat window theme"
-msgstr "Chat window theme"
+#: ../data/empathy.desktop.in.in.h:4
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 
-#: ../data/empathy.schemas.in.h:4
-#, fuzzy
-msgid "Compact contact list"
-msgstr "_Show Contact List"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
 
-#: ../data/empathy.schemas.in.h:5
-msgid "Contact list sort criterium"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Default directory to select an avatar image from"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
+"Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/empathy.schemas.in.h:7
-msgid "Enable popup when contact is available"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Show avatars"
+msgstr "Show avatars"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/empathy.schemas.in.h:8
-#, fuzzy
-msgid "Enable sound when away"
-msgstr "Disable sounds when _away"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Show protocols"
+msgstr "Show protocols"
 
-#: ../data/empathy.schemas.in.h:9
-#, fuzzy
-msgid "Enable sound when busy"
-msgstr "Disable sounds when _busy"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/empathy.schemas.in.h:10
-#, fuzzy
-msgid "Enable spell checker"
-msgstr "Enable spell checking"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Compact contact list"
+msgstr "Compact contact list"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Whether to show the contact list in compact mode."
+msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Hide main window"
 msgstr "Hide main window"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Hide the main window."
 msgstr "Hide the main window."
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+msgid "Default directory to select an avatar image from"
+msgstr "Default directory to select an avatar image from"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/empathy.schemas.in.h:14
-#, fuzzy
-msgid "Show avatars"
-msgstr "_Show Contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
 
-#: ../data/empathy.schemas.in.h:15
-#, fuzzy
-msgid "Show hint about closing the main window"
-msgstr "The height of the main window."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+msgid "Display incoming events in the status area"
+msgstr "Display incoming events in the status area"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 
-#: ../data/empathy.schemas.in.h:17
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
 
-#: ../data/empathy.schemas.in.h:18
-msgid "The last directory that an avatar image was chosen from."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "Contact list sort criterion"
+msgstr "Contact list sort criterion"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+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 ""
+"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."
 
-#: ../data/empathy.schemas.in.h:19
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Play a sound for incoming messages"
+msgstr "Play a sound for incoming messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Play a sound for outgoing messages"
+msgstr "Play a sound for outgoing messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+msgid "Play a sound for new conversations"
+msgstr "Play a sound for new conversations"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Play a sound when a contact logs in"
+msgstr "Play a sound when a contact logs in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Play a sound when a contact logs out"
+msgstr "Play a sound when a contact logs out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+msgid "Play a sound when we log in"
+msgstr "Play a sound when we log in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+msgid "Play a sound when we log out"
+msgstr "Play a sound when we log out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/empathy.schemas.in.h:21
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/empathy.schemas.in.h:22
-#, fuzzy
-msgid "Use theme for chat rooms"
-msgstr "_Invite to Chat Room"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid "Chat window theme"
+msgstr "Chat window theme"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Whether or not to convert smileys into graphical images in conversations."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/empathy.schemas.in.h:25
-msgid "Whether or not to play a sound when messages arrive."
-msgstr "Whether or not to play a sound when messages arrive."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
 
-#: ../data/empathy.schemas.in.h:26
-msgid "Whether or not to play sounds when away."
-msgstr "Whether or not to play sounds when away."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Whether or not to play sounds when busy."
-msgstr "Whether or not to play sounds when busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
-#: ../data/empathy.schemas.in.h:28
-#, fuzzy
-msgid "Whether or not to show a popup when a contact becomes available."
-msgstr "Whether or not to play a sound when messages arrive."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
-#: ../data/empathy.schemas.in.h:29
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "Nick completed character"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
-#: ../data/empathy.schemas.in.h:32
-#, fuzzy
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
-#: ../data/empathy.schemas.in.h:33
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialog"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus object path of the last account selected to join a room."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Camera device"
+msgstr "Camera device"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Camera position"
+msgstr "Camera position"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Echo cancellation support"
+msgstr "Echo cancellllation support"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellllation filter."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 
-#: ../libempathy/gossip-contact.c:654 ../libempathy/gossip-presence.c:184
-#: ../libempathy/gossip-presence.c:283
-msgid "Offline"
-msgstr "Offline"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the cellular network to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Whether Empathy can use the cellular network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Manage Messaging and VoIP accounts"
+
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "No reason was specified"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "The change in state was requested"
 
-#: ../libempathy/gossip-presence.c:274
-#, fuzzy
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "You cancellled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant cancellled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Error while trying to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "The other participant is unable to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "File transfer completed, but the file was corrupted"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "File transfer not supported by remote contact"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "The selected file is not a regular file"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "The selected file is empty"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "Missed call from %s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "Called %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "Call from %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
-msgstr "Available..."
+msgstr "Available"
 
-#: ../libempathy/gossip-presence.c:276
-#, fuzzy
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
-msgstr "Busy..."
+msgstr "Busy"
 
-#: ../libempathy/gossip-presence.c:279
-#, fuzzy
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
-msgstr "Away..."
-
-#: ../libempathy-gtk/empathy-main-window.c:254
-#, fuzzy
-msgid "Show and edit accounts"
-msgstr "_Show Contacts"
+msgstr "Away"
 
-#: ../libempathy-gtk/empathy-main-window.c:456
-msgid "Group"
-msgstr "Group"
+#: ../libempathy/empathy-utils.c:240
+msgid "Invisible"
+msgstr "Invisible"
 
-#: ../libempathy-gtk/empathy-main-window.c:477
-#, fuzzy
-msgid "Contact"
-msgstr "_Add Contact..."
+#: ../libempathy/empathy-utils.c:242
+msgid "Offline"
+msgstr "Offline"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
-#, fuzzy
-msgid "Contact List - Empathy"
-msgstr "_Hide Contact List"
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
+msgid "Unknown"
+msgstr "Unknown"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
-#, fuzzy
-msgid "Context"
-msgstr "_Contents"
+#: ../libempathy/empathy-utils.c:285
+msgid "No reason specified"
+msgstr "No reason specified"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
-#, fuzzy
-msgid "Join _Favorites"
-msgstr "_Add to Favourites"
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+msgid "Status is set to offline"
+msgstr "Status is set to offline"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-#: ../libempathy-gtk/gossip-chat.glade.h:10
-msgid "Join _New..."
-msgstr ""
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+msgid "Network error"
+msgstr "Network error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-#, fuzzy
-msgid "Manage Favorites..."
-msgstr "_Add to Favourites"
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+msgid "Authentication failed"
+msgstr "Authentication failed"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "Show _Offline Contacts"
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+msgid "Encryption error"
+msgstr "Encryption error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:7
-#, fuzzy
-msgid "_About"
-msgstr "_Accounts"
+#: ../libempathy/empathy-utils.c:295
+msgid "Name in use"
+msgstr "Name in use"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+msgid "Certificate not provided"
+msgstr "Certificate not provided"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-#: ../libempathy-gtk/gossip-chat.glade.h:15
-msgid "_Add Contact..."
-msgstr "_Add Contact..."
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+msgid "Certificate untrusted"
+msgstr "Certificate untrusted"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
-#: ../libempathy-gtk/gossip-contact-list.c:298
-msgid "_Chat"
-msgstr "_Chat"
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+msgid "Certificate expired"
+msgstr "Certificate expired"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
-msgid "_Contents"
-msgstr "_Contents"
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+msgid "Certificate not activated"
+msgstr "Certificate not activated"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-#: ../libempathy-gtk/gossip-chat.glade.h:21
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "_Edit"
-msgstr "Edit"
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+msgid "Certificate hostname mismatch"
+msgstr "Certificate hostname mismatch"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
-msgstr ""
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+msgid "Certificate fingerprint mismatch"
+msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Message..."
-msgstr "_New Message..."
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+msgid "Certificate self-signed"
+msgstr "Certificate self-signed"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
-msgid "_Personal Information"
-msgstr "_Personal Information"
+#: ../libempathy/empathy-utils.c:311
+msgid "Certificate error"
+msgstr "Certificate error"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-msgid "_Preferences"
-msgstr "_Preferences"
+#: ../libempathy/empathy-utils.c:345
+msgid "Encryption is not available"
+msgstr "Encryption is not available"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
-msgstr ""
+#: ../libempathy/empathy-utils.c:347
+msgid "Certificate is invalid"
+msgstr "Certificate is invalid"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-#: ../libempathy-gtk/gossip-chat.glade.h:25
-#, fuzzy
-msgid "_Room"
-msgstr "_Room:"
+#: ../libempathy/empathy-utils.c:349
+msgid "Connection has been refused"
+msgstr "Connection has been refused"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-#: ../libempathy-gtk/gossip-chat.glade.h:28
-#: ../libempathy-gtk/gossip-contact-list.c:326
-#, fuzzy
-msgid "_View Previous Conversations"
-msgstr "_Conversation"
+#: ../libempathy/empathy-utils.c:351
+msgid "Connection can't be established"
+msgstr "Connection can't be established"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
-msgstr "Status"
+#: ../libempathy/empathy-utils.c:353
+msgid "Connection has been lost"
+msgstr "Connection has been lost"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:63
+#: ../libempathy/empathy-utils.c:357
 msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
+"Connection has been replaced by a new connection using the same resource"
 msgstr ""
+"Connection has been replaced by a new connection using the same resource"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "The account already exists on the server"
+msgstr "The account already exists on the server"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Server is currently too busy to handle the connection"
+msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:67
+#: ../libempathy/empathy-utils.c:364
+msgid "Certificate has been revoked"
+msgstr "Certificate has been revoked"
+
+#: ../libempathy/empathy-utils.c:366
 msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:71
+#: ../libempathy/empathy-utils.c:369
 msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
 msgstr ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:99
-#, fuzzy
-msgid "An Instant Messaging client for GNOME"
-msgstr "Gossip, Instant Messaging Client"
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Your software is too old"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:105
-#, fuzzy
-msgid "translator-credits"
-msgstr "Adam Weinberger"
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internal error"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:224
-#, fuzzy
-msgid "Disable"
-msgstr "Available..."
+#: ../libempathy/empathy-utils.c:534
+msgid "People Nearby"
+msgstr "People Nearby"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:227
-msgid "Enable"
-msgstr ""
+#: ../libempathy/empathy-utils.c:539
+msgid "Yahoo! Japan"
+msgstr "Yahoo! Japan"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:261
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:3
-#, fuzzy
-msgid "<b>No Account Selected</b>"
-msgstr "<b>About</b>"
+#: ../libempathy/empathy-utils.c:568
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:263
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
-msgstr ""
+#: ../libempathy/empathy-utils.c:569
+msgid "Facebook Chat"
+msgstr "Facebook Chat"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:272
-#, fuzzy
-msgid "<b>No Accounts Configured</b>"
-msgstr "<b>About</b>"
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d second ago"
+msgstr[1] "%d seconds ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:274
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring."
-msgstr ""
+#: ../libempathy/empathy-time.c:96
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d minute ago"
+msgstr[1] "%d minutes ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:362
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:6
-msgid "Accounts"
-msgstr "Accounts"
+#: ../libempathy/empathy-time.c:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d hour ago"
+msgstr[1] "%d hours ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:857
+#: ../libempathy/empathy-time.c:108
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d day ago"
+msgstr[1] "%d days ago"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:863
+#: ../libempathy/empathy-time.c:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d week ago"
+msgstr[1] "%d weeks ago"
+
+#: ../libempathy/empathy-time.c:120
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d month ago"
+msgstr[1] "%d months ago"
+
+#: ../libempathy/empathy-time.c:142
+msgid "in the future"
+msgstr "in the future"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "All accounts"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
+msgid "Account"
+msgstr "Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:683
+msgid "Password"
+msgstr "Password"
+
+#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "Server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "Port"
+
+#: ../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:10
+msgid "Username:"
+msgstr "Username:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1710
+msgid "A_pply"
+msgstr "A_pply"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1739
+msgid "L_og in"
+msgstr "L_og in"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1812
+msgid "This account already exists on the server"
+msgstr "This account already exists on the server"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1816
+msgid "Create a new account on the server"
+msgstr "Create a new account on the server"
+
+#. 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 on %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 "%s Account"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2271
+msgid "New account"
+msgstr "New account"
+
+#: ../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:"
+msgstr "Pass_word:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
+
+#: ../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-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../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-msn.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
+
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Advanced"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
+msgid "What is your AIM screen name?"
+msgstr "What is your AIM screen name?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Remember Password"
+
+#: ../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:"
+msgstr "Login I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Example:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "What is your GroupWise User ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+msgid "What is your GroupWise password?"
+msgstr "What is your GroupWise password?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>Example:</b> 123456789"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "Ch_aracter set:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+msgid "What is your ICQ UIN?"
+msgstr "What is your ICQ UIN?"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+msgid "What is your ICQ password?"
+msgstr "What is your ICQ password?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+msgid "Auto"
+msgstr "Auto"
+
+#: ../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 "Register"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+msgid "Options"
+msgstr "Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+msgid "None"
+msgstr "None"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Network"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Network:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "Character set:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servers"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 msgstr ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:1
-#, fuzzy
-msgid "<b>Account</b>"
-msgstr "<b>About</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Nickname:"
+msgstr "Nickname:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:2
-#, fuzzy
-msgid "<b>New Account</b>"
-msgstr "<b>About</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Password:"
+msgstr "Password:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:4
-#, fuzzy
-msgid "<b>Settings</b>"
-msgstr "<b>Status</b>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Quit message:"
+msgstr "Quit message:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:5
-msgid "A unique name for this account to identify it personally to you."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "Real name:"
+msgstr "Real name:"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:7
-#, fuzzy
-msgid "Cr_eate"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "Which IRC network?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:8
-msgid "Imendio "
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:9
-msgid "Jabber"
-msgstr "Jabber"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:10
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to started configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 msgstr ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:13
-msgid "_Name:"
-msgstr "_Name:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "What is your Facebook password?"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:14
-#, fuzzy
-msgid "_Type:"
-msgstr "_Topic:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "What is your Google ID?"
 
-#: ../libempathy-gtk/gossip-account-widget-generic.c:144
-#: ../libempathy-gtk/gossip-account-widget-generic.c:186
-#, c-format
-msgid "%s:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Example:</b> user@gmail.com"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:1
-#, fuzzy
-msgid ""
-"<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
-"small>"
-msgstr "<span size=\"smaller\">Example: user@jabber.org</span>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "What is your Google password?"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:2
-msgid "Forget password and clear the entry."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Example:</b> user@jabber.org"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:3
-msgid "Login I_D:"
-msgstr "Login I_D:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:4
-#, fuzzy
-msgid "Pass_word:"
-msgstr "_Password:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:5
-#, fuzzy
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
-msgstr "R_esource:"
+msgstr "Reso_urce:"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:6
-#, fuzzy
-msgid "Use encryption (SS_L)"
-msgstr "Use _encryption (SSL)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:7
-#, fuzzy
-msgid "_Port:"
-msgstr "Por_t:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:8
-msgid "_Server:"
-msgstr "_Server:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Override server settings"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:9
-msgid "jabber account settings"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+msgid "What is your Jabber ID?"
+msgstr "What is your Jabber ID?"
 
-#: ../libempathy-gtk/gossip-chat.c:314
-msgid "Disconnected"
-msgstr "Disconnected"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "What is your desired Jabber ID?"
 
-#: ../libempathy-gtk/gossip-chat.c:858
-msgid "Insert Smiley"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
 
-#: ../libempathy-gtk/gossip-chat.c:906
-msgid "_Check Word Spelling..."
-msgstr "_Check Word Spelling..."
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+msgid "What is your desired Jabber password?"
+msgstr "What is your desired Jabber password?"
 
-#: ../libempathy-gtk/gossip-chat.c:1244
-msgid "Connected"
-msgstr "Connected"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>Example:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:1
-msgid "C_lear"
-msgstr "C_lear"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "What is your Windows Live ID?"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:2
-msgid "Change _Topic..."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "What is your Windows Live password?"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "Nic_kname:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:4
-#, fuzzy
-msgid "Contact Infor_mation"
-msgstr "Contact _Information"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Last Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:5
-#, fuzzy
-msgid "Cu_t"
-msgstr "Ch_at"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "_First Name:"
+msgstr "_First Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:6
-msgid "In_vite..."
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Published Name:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:7
-msgid "Insert _Smiley"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:8
-#, fuzzy
-msgid "Invitation _message:"
-msgstr "Enter status message:"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+msgid "E-_mail address:"
+msgstr "E-_mail address:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:9
-msgid "Invite"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Username:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:11
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>Example:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:12
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:13
-msgid "Select who would you like to invite:"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:14
-msgid "You have been invited to join a chat conference."
-msgstr "You have been invited to join a chat conference."
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
+msgid "Proxy Options"
+msgstr "Proxy Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:16
-#, fuzzy
-msgid "_Add To Favorites"
-msgstr "_Add to Favourites"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:17
-msgid "_Close"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "STUN Server:"
+msgstr "STUN Server:"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:18
-msgid "_Conversation"
-msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:19
-msgid "_Copy"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Discover Binding"
+msgstr "Discover Binding"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:20
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "Mechanism:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Authentication username:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Loose Routing"
+msgstr "Loose Routing"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "Port:"
+msgstr "Port:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP login ID?"
+msgstr "What is your SIP login ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "I_gnore conference and chat room invitations"
+msgstr "I_gnore conference and chat room invitations"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "What is your Yahoo! ID?"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "What is your Yahoo! password?"
+msgstr "What is your Yahoo! password?"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+msgid "Couldn't convert image"
+msgstr "Couldn't convert image"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:22
-msgid "_Next Tab"
-msgstr "_Next Tab"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+msgid "None of the accepted image formats are supported on your system"
+msgstr "None of the accepted image formats are supported on your system"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:23
-msgid "_Paste"
-msgstr ""
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "Couldn't save picture to file"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:24
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+msgid "Select Your Avatar Image"
+msgstr "Select Your Avatar Image"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:26
-msgid "_Show Contacts"
-msgstr "_Show Contacts"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "Take a picture..."
 
-#: ../libempathy-gtk/gossip-chat.glade.h:27
-msgid "_Tabs"
-msgstr "_Tabs"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+msgid "No Image"
+msgstr "No Image"
 
-#: ../libempathy-gtk/gossip-chat-view.c:544
-msgid "_Copy Link Address"
-msgstr "_Copy Link Address"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+msgid "Images"
+msgstr "Images"
 
-#: ../libempathy-gtk/gossip-chat-view.c:552
-msgid "_Open Link"
-msgstr "_Open Link"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+msgid "All Files"
+msgstr "All Files"
 
-#: ../libempathy-gtk/gossip-chat-view.c:889
-msgid "%A %d %B %Y"
-msgstr "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-avatar-image.c:322
+msgid "Click to enlarge"
+msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/gossip-chat-window.c:685
-#: ../libempathy-gtk/gossip-chat-window.c:715
-#, fuzzy
-msgid "New Message"
-msgid_plural "New Messages"
-msgstr[0] "_New Message..."
-msgstr[1] "_New Message..."
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:62
+msgid "There was an error starting the call"
+msgstr "There was an error starting the call"
 
-#: ../libempathy-gtk/gossip-chat-window.c:691
-#, fuzzy
-msgid "Chat Room"
-msgstr "Chat Room:"
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "The specified contact doesn't support calls"
 
-#: ../libempathy-gtk/gossip-chat-window.c:696
-#: ../libempathy-gtk/gossip-chat-window.c:719
-#, fuzzy, c-format
-msgid "Conversation"
-msgid_plural "Conversations (%d)"
-msgstr[0] "_Conversation"
-msgstr[1] "_Conversation"
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "The specified contact is offline"
 
-#: ../libempathy-gtk/gossip-chat-window.c:1295
-msgid "Typing a message."
-msgstr "Typing a message."
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "The specified contact is not valid"
 
-#: ../libempathy-gtk/gossip-contact-list.c:290
-#, fuzzy
-msgid "_Contact"
-msgstr "_Add Contact..."
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "Emergency calls are not supported on this protocol"
 
-#: ../libempathy-gtk/gossip-contact-list.c:294
-#, fuzzy
-msgid "_Group"
-msgstr "Group"
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
 
-#: ../libempathy-gtk/gossip-contact-list.c:298
-#, fuzzy
-msgid "Chat with contact"
-msgstr "Add a contact"
+#: ../libempathy-gtk/empathy-chat.c:710
+msgid "Failed to open private chat"
+msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
-#, fuzzy
-msgid "Infor_mation"
-msgstr "Contact _Information"
-
-#: ../libempathy-gtk/gossip-contact-list.c:302
-#, fuzzy
-msgid "View contact information"
-msgstr "Contact information"
-
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Re_name"
-msgstr "/Re_name group"
-
-#: ../libempathy-gtk/gossip-contact-list.c:306
-#, fuzzy
-msgid "Rename"
-msgstr "File name:"
-
-#: ../libempathy-gtk/gossip-contact-list.c:310
-#, fuzzy
-msgid "Edit the groups and name for this contact"
-msgstr ""
-"Please enter a new nickname for the contact\n"
-"%s"
+#: ../libempathy-gtk/empathy-chat.c:768
+msgid "Topic not supported on this conversation"
+msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "_Remove"
-msgstr "/_Remove Contact"
+#: ../libempathy-gtk/empathy-chat.c:774
+msgid "You are not allowed to change the topic"
+msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-#, fuzzy
-msgid "Remove contact"
-msgstr "/_Remove Contact"
+#: ../libempathy-gtk/empathy-chat.c:973
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "“%s” is not a valid contact ID"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-#, fuzzy
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-chat.c:1068
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: clear all messages from the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:1071
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <topic>: set the topic of the current conversation"
+
+#: ../libempathy-gtk/empathy-chat.c:1074
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <chat room ID>: join a new chat room"
+
+#: ../libempathy-gtk/empathy-chat.c:1077
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-msgid "Invite to a currently open chat room"
+#: ../libempathy-gtk/empathy-chat.c:1081
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
 msgstr ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-#, fuzzy
-msgid "_Send File..."
-msgstr "/_Send File..."
+#: ../libempathy-gtk/empathy-chat.c:1085
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-#, fuzzy
-msgid "Send a file"
-msgstr "Select a file"
+#: ../libempathy-gtk/empathy-chat.c:1088
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/gossip-contact-list.c:326
-#, fuzzy
-msgid "View previous conversations with this contact"
-msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-chat.c:1091
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/gossip-preferences.c:250
-msgid "Language"
-msgstr "Language"
+#: ../libempathy-gtk/empathy-chat.c:1094
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:1
-#, fuzzy
-msgid "<b>Appearance</b>"
-msgstr "<b>Appearance and Behaviour</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:2
-#, fuzzy
-msgid "<b>Audio</b>"
-msgstr "<b>About</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:3
-#, fuzzy
-msgid "<b>Behaviour</b>"
-msgstr "<b>Appearance and Behaviour</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:4
-#, fuzzy
-msgid "<b>Contact List</b>"
-msgstr "<b>Status</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:5
-msgid "<b>Languages</b>"
-msgstr "<b>Languages</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:6
-#, fuzzy
-msgid "<b>Options</b>"
-msgstr "Connection"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:7
-#, fuzzy
-msgid "<b>Visual</b>"
-msgstr "<b>Options</b>"
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:8
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
 msgstr ""
-"The list of languages here reflects only the languages for which you have a "
-"dictionary installed."
+"/say <message>: send <message> to the current conversation. This is used to "
+"send a message starting with a '/'. For example: \"/say /join is used to "
+"join a new chat room\""
+
+#: ../libempathy-gtk/empathy-chat.c:1102
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:9
-msgid "Avatars are user chosen images shown in the contact list"
+#: ../libempathy-gtk/empathy-chat.c:1105
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 msgstr ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:10
-#, fuzzy
-msgid "Chat Th_eme:"
-msgstr "Chat window theme"
+#: ../libempathy-gtk/empathy-chat.c:1124
+#, c-format
+msgid "Usage: %s"
+msgstr "Usage: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:11
-msgid "Display notifications when contacts come _online"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1169
+msgid "Unknown command"
+msgstr "Unknown command"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:12
-#, fuzzy
-msgid "Enable sounds when _away"
-msgstr "Disable sounds when _away"
+#: ../libempathy-gtk/empathy-chat.c:1295
+msgid "Unknown command; see /help for the available commands"
+msgstr "Unknown command; see /help for the available commands"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:13
-#, fuzzy
-msgid "Enable sounds when _busy"
-msgstr "Disable sounds when _busy"
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr "insufficient balance to send message"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:14
-msgid "General"
-msgstr "General"
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:15
-#, fuzzy
-msgid "Notifications"
-msgstr "Use notification sounds"
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:16
-#, fuzzy
-msgid "Preferences"
-msgstr "_Preferences"
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:17
-msgid "Show _avatars"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1593
+msgid "not capable"
+msgstr "not capable"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:18
-#, fuzzy
-msgid "Show _smileys as images"
-msgstr "Convert _smileys to graphical images"
+#: ../libempathy-gtk/empathy-chat.c:1600
+msgid "offline"
+msgstr "offline"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:19
-#, fuzzy
-msgid "Show co_mpact contact list"
-msgstr "_Show Contact List"
+#: ../libempathy-gtk/empathy-chat.c:1603
+msgid "invalid contact"
+msgstr "invalid contact"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:20
-msgid "Sort by _name"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1606
+msgid "permission denied"
+msgstr "permission denied"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:21
-msgid "Sort by s_tate"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1609
+msgid "too long message"
+msgstr "too long message"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:22
-msgid "Spell Checking"
-msgstr "Spell Checking"
+#: ../libempathy-gtk/empathy-chat.c:1612
+msgid "not implemented"
+msgstr "not implemented"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:23
-msgid "Themes"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1616
+msgid "unknown"
+msgstr "unknown"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:24
-#, fuzzy
-msgid "_Enable spell checking"
-msgstr "Enable spell checking"
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
+msgid "Topic:"
+msgstr "Topic:"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:25
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+#: ../libempathy-gtk/empathy-chat.c:1698
+#, c-format
+msgid "Topic set to: %s"
+msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:26
-msgid "_Play sound when messages arrive"
-msgstr "_Play sound when messages arrive"
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:27
-#, fuzzy
-msgid "_Use for chat rooms"
-msgstr "_Invite to Chat Room"
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
+msgid "No topic defined"
+msgstr "No topic defined"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:702
-#, fuzzy
-msgid "Custom message..."
-msgstr "_New Message..."
+#: ../libempathy-gtk/empathy-chat.c:2221
+msgid "(No Suggestions)"
+msgstr "(No Suggestions)"
 
-#. Clear list
-#: ../libempathy-gtk/gossip-presence-chooser.c:724
-#, fuzzy
-msgid "Clear List..."
-msgstr "Clear List"
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2289
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "Add '%s' to Dictionary"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:803
-#, fuzzy
-msgid "Are you sure you want to clear the list?"
-msgstr "Do you want to accept this file?"
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2326
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:807
-msgid ""
-"This will remove any custom messages you have added to the list of preset "
-"status messages."
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:2396
+msgid "Insert Smiley"
+msgstr "Insert Smiley"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:812
-msgid "Clear List"
-msgstr "Clear List"
+#. send button
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
+msgid "_Send"
+msgstr "_Send"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:1
-msgid "Enter status message:"
-msgstr "Enter status message:"
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2471
+msgid "_Spelling Suggestions"
+msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:2
-#, fuzzy
-msgid "Status Message Presets"
-msgstr "Add to status message list"
+#: ../libempathy-gtk/empathy-chat.c:2560
+msgid "Failed to retrieve recent logs"
+msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:3
-#, fuzzy
-msgid "_Add to status message list"
-msgstr "Add to status message list"
+#: ../libempathy-gtk/empathy-chat.c:2699
+#, c-format
+msgid "%s has disconnected"
+msgstr "%s has disconnected"
 
-#: ../libempathy-gtk/gossip-private-chat.c:198
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
-msgid "%s went offline"
-msgstr "%s went offline"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/gossip-private-chat.c:212
-#, fuzzy, c-format
-msgid "%s has come online"
-msgstr "%s comes online"
+#: ../libempathy-gtk/empathy-chat.c:2709
+#, c-format
+msgid "%s was kicked"
+msgstr "%s was kicked"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:87
-msgid "Classic"
-msgstr ""
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2717
+#, c-format
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:88
-#, fuzzy
-msgid "Simple"
-msgstr "Example: %s"
+#: ../libempathy-gtk/empathy-chat.c:2720
+#, c-format
+msgid "%s was banned"
+msgstr "%s was banned"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:89
-#, fuzzy
-msgid "Clean"
-msgstr "C_lear"
+#: ../libempathy-gtk/empathy-chat.c:2724
+#, c-format
+msgid "%s has left the room"
+msgstr "%s has left the room"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:2733
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:90
-#, fuzzy
-msgid "Blue"
-msgstr "Basque"
+#: ../libempathy-gtk/empathy-chat.c:2758
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s has joined the room"
 
-#: ../src/empathy-main.c:145
-msgid "Don't connect on startup"
-msgstr "Don't connect on startup"
+#: ../libempathy-gtk/empathy-chat.c:2783
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s is now known as %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:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+msgid "Disconnected"
+msgstr "Disconnected"
 
-#: ../src/empathy-main.c:155
-#, fuzzy
-msgid "- Empathy Instant Messenger"
-msgstr "Gossip Instant Messenger"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3634
+msgid "Would you like to store this password?"
+msgstr "Would you like to store this password?"
 
-#~ msgid "Gossip Instant Messenger"
-#~ msgstr "Gossip Instant Messenger"
+#: ../libempathy-gtk/empathy-chat.c:3640
+msgid "Remember"
+msgstr "Remember"
 
-#, fuzzy
-#~ msgid "Joining"
-#~ msgstr "_Join"
+#: ../libempathy-gtk/empathy-chat.c:3650
+msgid "Not now"
+msgstr "Not now"
 
-#, fuzzy
-#~ msgid "Active"
-#~ msgstr "Actions"
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+msgid "Retry"
+msgstr "Retry"
 
-#~ msgid "Unknown"
-#~ msgstr "Unknown"
+#: ../libempathy-gtk/empathy-chat.c:3698
+msgid "Wrong password; please try again:"
+msgstr "Wrong password; please try again:"
 
-#, fuzzy
-#~ msgid "Error"
-#~ msgstr "Last Error"
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3828
+msgid "This room is protected by a password:"
+msgstr "This room is protected by a password:"
 
-#, fuzzy
-#~ msgid "Participant"
-#~ msgid_plural "Participants"
-#~ msgstr[0] "Galician"
-#~ msgstr[1] "Galician"
+#: ../libempathy-gtk/empathy-chat.c:3855
+msgid "Join"
+msgstr "Join"
 
-#, fuzzy
-#~ msgid "No affiliation"
-#~ msgstr "Use notification sounds"
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
+msgid "Connected"
+msgstr "Connected"
 
-#~ msgid "The nickname you have chosen is already in use."
-#~ msgstr "The nickname you have chosen is already in use."
+#: ../libempathy-gtk/empathy-chat.c:4102
+msgid "Conversation"
+msgstr "Conversation"
 
-#~ msgid "The chat room you tried to join requires a password."
-#~ msgstr "The chat room you tried to join requires a password."
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (SMS)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+msgid "Unknown or invalid identifier"
+msgstr "Unknown or invalid identifier"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+msgid "Contact blocking temporarily unavailable"
+msgstr "Contact blocking temporarily unavailable"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+msgid "Contact blocking unavailable"
+msgstr "Contact blocking unavailable"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+msgid "Permission Denied"
+msgstr "Permission Denied"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+msgid "Could not block contact"
+msgstr "Could not block contact"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
+msgid "Edit Blocked Contacts"
+msgstr "Edit Blocked Contacts"
+
+#. 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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "Account:"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "Blocked Contacts"
+
+#: ../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
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Remove"
+
+#. 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 "_Copy Link Address"
 
-#~ msgid "The remote conference server did not respond in a sensible time."
-#~ msgstr "The remote conference server did not respond in a sensible time."
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Open Link"
+msgstr "_Open Link"
 
-#~ msgid "The conference server you tried to join could not be found."
-#~ msgstr "The conference server you tried to join could not be found."
+#. 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 %e %Y"
 
-#, fuzzy
-#~ msgid "An unknown error occurred, check your details are correct."
-#~ msgstr "Ensure that your details are correct."
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "New Contact"
 
-#, fuzzy
-#~ msgid "Unavailable"
-#~ msgstr "Service Unavailable"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "Block %s?"
 
-#, fuzzy
-#~ msgid "An unknown error occurred."
-#~ msgstr "An unknown error occurred."
+#: ../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 "Are you sure you want to block '%s' from contacting you again?"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_Block"
+
+#: ../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] "_Report this contact as abusive"
+msgstr[1] "_Report these contacts as abusive"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "Subscription Request"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "_Block User"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decide _Later"
+
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+msgid "Search contacts"
+msgstr "Search contacts"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+msgid "Search: "
+msgstr "Search: "
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+msgid "_Add Contact"
+msgstr "_Add Contact"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+msgid "No contacts found"
+msgstr "No contacts found"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "Your message introducing yourself:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "Please let me see when you're online. Thanks!"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "Channels:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "Country ISO Code:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "Country:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "State:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "City:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "Area:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "Postal Code:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "Street:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "Building:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "Floor:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "Room:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "Text:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "Description:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "Accuracy Level:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "Error:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "Vertical Error (metres):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "Horizontal Error (metres):"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "Speed:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "Bearing:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "Climb Speed:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "Last Updated on:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "Longitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "Latitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "Altitude:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
+msgid "Location"
+msgstr "Location"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y at %I:%M %p UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "Save Avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "Unable to save avatar"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personal Details"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Contact Details"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Full name"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Phone number"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Website"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Birthday"
+
+#. 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 "Last seen:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. 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 "Away message:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "work"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "home"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobile"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voice"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferred"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identifier:"
+
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Information requested…"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS:"
+msgstr "OS:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Version:"
+msgstr "Version:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
+msgid "Groups"
+msgstr "Groups"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:343
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
 
-#~ msgid "Connection refused."
-#~ msgstr "Connection refused."
+#: ../libempathy-gtk/empathy-groups-widget.c:362
+msgid "_Add Group"
+msgstr "_Add Group"
 
-#~ msgid "Server address could not be resolved."
-#~ msgstr "Server address could not be resolved."
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "Select"
 
-#~ msgid "Connection timed out."
-#~ msgstr "Connection timed out."
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
+msgid "Group"
+msgstr "Group"
 
-#~ msgid "Authentication failed."
-#~ msgstr "Authentication failed."
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "The following identity will be blocked:"
+msgstr[1] "The following identities will be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "The following identity can not be blocked:"
+msgstr[1] "The following identities can not be blocked:"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
+
+#. 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:172
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "Select account to use to place the call"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "Mobile"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "Work"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "HOME"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Chat"
 
-#, fuzzy
-#~ msgid "The username you are trying already exists."
-#~ msgstr "The nickname you have chosen is already in use."
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "Infor_mation"
 
-#, fuzzy
-#~ msgid "The username you are trying is not valid."
-#~ msgstr "The nickname you have chosen is already in use."
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "_Edit"
 
-#, fuzzy
-#~ msgid "This feature is unavailable."
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
 
-#, fuzzy
-#~ msgid "new account"
-#~ msgstr "Account"
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
 
-#~ msgid "Home"
-#~ msgstr "Home"
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Add Contact…"
 
-#~ msgid "Couldn't send message!"
-#~ msgstr "Could not send message."
+#: ../libempathy-gtk/empathy-individual-view.c:2306
+msgid "Delete and _Block"
+msgstr "Delete and _Block"
 
-#~ msgid "Connection could not be opened"
-#~ msgstr "Connection could not be opened"
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
 
-#, fuzzy
-#~ msgid "This service is unavailable or not found"
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Removing group"
 
-#, fuzzy
-#~ msgid "Registration is required"
-#~ msgstr "Registration Required"
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Remove"
 
-#, fuzzy
-#~ msgid "There was an internal service error"
-#~ msgstr "Internal Server Error"
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
 
-#, fuzzy
-#~ msgid "This feature is not implemented"
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-individual-view.c:2485
+#, 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 ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
 
-#, fuzzy
-#~ msgid "The remote service timed out"
-#~ msgstr "Remote Server Timeout"
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Removing contact"
 
-#~ msgid "Disconnect"
-#~ msgstr "Disconnect"
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "Linked contact containing %u contact"
+msgstr[1] "Linked contacts containing %u contacts"
 
-#~ msgid "Connect"
-#~ msgstr "Connect"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>Location</b> at (date)"
 
-#, fuzzy
-#~ msgid "Successfully registered your new account settings."
-#~ msgstr "Successfully registered the account"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "Online from a phone or mobile device"
 
-#, fuzzy
-#~ msgid "Failed to register your new account settings."
-#~ msgstr "Failed registering the account"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "New Network"
 
-#, fuzzy
-#~ msgid "Successfully changed your account password."
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+msgid "Choose an IRC network"
+msgstr "Choose an IRC network"
 
-#, fuzzy
-#~ msgid "Failed to change your account password."
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+msgid "Reset _Networks List"
+msgstr "Reset _Networks List"
 
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a new password for this account:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "Select"
 
-#~ msgid "No information is available for this contact."
-#~ msgstr "No information is available for this contact."
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "new server"
 
-#~ msgid "Information requested, please wait..."
-#~ msgstr "Information requested, please wait..."
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+msgid "SSL"
+msgstr "SSL"
 
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "I would like to add you to my contact list."
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "History"
 
-#~ msgid "To summarize:"
-#~ msgstr "To summarize:"
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "Show"
 
-#, fuzzy
-#~ msgid "%d new message"
-#~ msgid_plural "%d new messages"
-#~ msgstr[0] "_New Message..."
-#~ msgstr[1] "_New Message..."
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "Search"
 
-#, fuzzy
-#~ msgid "%d subscription request"
-#~ msgid_plural "%d subscription requests"
-#~ msgstr[0] "Gossip - Subscription Request"
-#~ msgstr[1] "Gossip - Subscription Request"
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat in %s"
+msgstr "Chat in %s"
 
-#, fuzzy
-#~ msgid "%d file transfer request"
-#~ msgid_plural "%d file transfer requests"
-#~ msgstr[0] "Gossip - File Transfer Request"
-#~ msgstr[1] "Gossip - File Transfer Request"
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "Chat with %s"
 
-#, fuzzy
-#~ msgid "%d server message"
-#~ msgid_plural "%d server messages"
-#~ msgstr[0] "Could not send message."
-#~ msgstr[1] "Could not send message."
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A, %e %B %Y %X"
 
-#, fuzzy
-#~ msgid "%d error"
-#~ msgid_plural "%d errors"
-#~ msgstr[0] "Last Error"
-#~ msgstr[1] "Last Error"
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1291
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
 
-#, fuzzy
-#~ msgid "If you quit, you will lose all unread information."
-#~ msgstr "If you quit, you will loose all unread information."
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
 
-#, fuzzy
-#~ msgid "Edit Account _Details"
-#~ msgstr "Edit your chat room details:"
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s second"
+msgstr[1] "%s seconds"
 
-#~ msgid "Word"
-#~ msgstr "Word"
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minute"
+msgstr[1] "%s minutes"
 
-#~ msgid "New message from %s"
-#~ msgstr "New message from %s"
+#: ../libempathy-gtk/empathy-log-window.c:1388
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "Call took %s, ended at %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+msgid "Today"
+msgstr "Today"
+
+#: ../libempathy-gtk/empathy-log-window.c:1726
+msgid "Yesterday"
+msgstr "Yesterday"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1741
+msgid "%e %B %Y"
+msgstr "%e %B %Y"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
+msgid "Anytime"
+msgstr "Anytime"
+
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "Anyone"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "Who"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "When"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Anything"
+msgstr "Anything"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Text chats"
+msgstr "Text chats"
+
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "Calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "Incoming calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "Outgoing calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "Missed calls"
+
+#: ../libempathy-gtk/empathy-log-window.c:3073
+msgid "What"
+msgstr "What"
+
+#: ../libempathy-gtk/empathy-log-window.c:3782
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "Are you sure you want to delete all logs of previous conversations?"
+
+#: ../libempathy-gtk/empathy-log-window.c:3786
+msgid "Clear All"
+msgstr "Clear All"
+
+#: ../libempathy-gtk/empathy-log-window.c:3793
+msgid "Delete from:"
+msgstr "Delete from:"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+msgid "_File"
+msgstr "_File"
+
+#: ../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 "_Edit"
 
-#, fuzzy
-#~ msgid "Your invitation has been declined"
-#~ msgstr "Your file transfer offer was declined."
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+msgid "Delete All History..."
+msgstr "Delete All History..."
 
-#~ msgid "Accept"
-#~ msgstr "Accept"
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+msgid "Profile"
+msgstr "Profile"
 
-#, fuzzy
-#~ msgid "Name"
-#~ msgstr "Name:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
-#, fuzzy
-#~ msgid "Room"
-#~ msgstr "_Room:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "page 2"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "The contact is offline"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Enter a contact identifier or phone number:"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
+msgid "New Conversation"
+msgstr "New Conversation"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+msgid "New Call"
+msgstr "New Call"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Authentification failed for account <b>%s</b>"
 
-#, fuzzy
-#~ msgid "Auto Connect"
-#~ msgstr "Stop Connecting"
+#: ../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 ""
+"Enter your password for account\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
+msgid "Custom Message…"
+msgstr "Custom Message…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
+msgid "Edit Custom Messages…"
+msgstr "Edit Custom Messages…"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
+msgid "Click to remove this status as a favorite"
+msgstr "Click to remove this status as a favourite"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
+msgid "Click to make this status a favorite"
+msgstr "Click to make this status a favourite"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
+msgid "Set status"
+msgstr "Set status"
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+msgid "Custom messages…"
+msgstr "Custom messages…"
+
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "New %s account"
 
-#, fuzzy
-#~ msgid "Information requested..."
-#~ msgstr "Information requested, please wait..."
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "Find:"
 
-#, fuzzy
-#~ msgid "Do you want to remove this contact from your roster?"
-#~ msgstr ""
-#~ "Do you want to remove the contact\n"
-#~ "%s\n"
-#~ "from your contact list?"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "_Previous"
 
-#~ msgid ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new name for the group:\n"
-#~ "%s"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "_Next"
 
-#~ msgid "Select"
-#~ msgstr "Select"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
 
-#~ msgid "Unsorted"
-#~ msgstr "Unsorted"
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "Phrase not found"
 
-#~ msgid "New file transfer request from %s"
-#~ msgstr "New file transfer request from %s"
+#: ../libempathy-gtk/empathy-sound-manager.c:51
+msgid "Received an instant message"
+msgstr "Received an instant message"
 
-#~ msgid "File transfer is not supported by both parties."
-#~ msgstr "File transfer is not supported by both parties."
+#: ../libempathy-gtk/empathy-sound-manager.c:53
+msgid "Sent an instant message"
+msgstr "Sent an instant message"
 
-#~ msgid "Your file transfer offer declined."
-#~ msgstr "Your file transfer offer was declined."
+#: ../libempathy-gtk/empathy-sound-manager.c:55
+msgid "Incoming chat request"
+msgstr "Incoming chat request"
 
-#~ msgid "The other user decided not to continue."
-#~ msgstr "The other user decided not to continue."
+#: ../libempathy-gtk/empathy-sound-manager.c:57
+msgid "Contact connected"
+msgstr "Contact connected"
 
-#, fuzzy
-#~ msgid "Unknown error occurred during file transfer."
-#~ msgstr "Unknown error occured during file transfer."
+#: ../libempathy-gtk/empathy-sound-manager.c:59
+msgid "Contact disconnected"
+msgstr "Contact disconnected"
 
-#~ msgid "%s would like to send you a file."
-#~ msgstr "%s would like to send you a file."
+#: ../libempathy-gtk/empathy-sound-manager.c:61
+msgid "Connected to server"
+msgstr "Connected to server"
 
-#~ msgid "Someone would like to send you a file."
-#~ msgstr "Someone would like to send you a file."
+#: ../libempathy-gtk/empathy-sound-manager.c:63
+msgid "Disconnected from server"
+msgstr "Disconnected from server"
 
-#~ msgid "Select a file"
-#~ msgstr "Select a file"
+#: ../libempathy-gtk/empathy-sound-manager.c:65
+msgid "Incoming voice call"
+msgstr "Incoming voice call"
 
-#, fuzzy
-#~ msgid "Connecting..."
-#~ msgstr "Connecting"
+#: ../libempathy-gtk/empathy-sound-manager.c:67
+msgid "Outgoing voice call"
+msgstr "Outgoing voice call"
 
-#, fuzzy
-#~ msgid "Retry connection"
-#~ msgstr "Stop Connecting"
+#: ../libempathy-gtk/empathy-sound-manager.c:69
+msgid "Voice call ended"
+msgstr "Voice call ended"
 
-#~ msgid "Invited %s to join this chat conference."
-#~ msgstr "Invited %s to join this chat conference."
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+msgid "Edit Custom Messages"
+msgstr "Edit Custom Messages"
 
-#, fuzzy
-#~ msgid "Enter the new topic you want to set for this room:"
-#~ msgstr "What nickname do you want to use for this contact?"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "Message edited at %s"
 
-#, fuzzy
-#~ msgid "Topic: %s"
-#~ msgstr "_Topic:"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "Normal"
 
-#~ msgid "Account"
-#~ msgstr "Account"
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Classic"
+msgstr "Classic"
 
-#, fuzzy
-#~ msgid "Conversation With"
-#~ msgstr "_Conversation"
+#: ../libempathy-gtk/empathy-theme-manager.c:71
+msgid "Simple"
+msgstr "Simple"
 
-#~ msgid "List the available accounts"
-#~ msgstr "List the available accounts"
+#: ../libempathy-gtk/empathy-theme-manager.c:72
+msgid "Clean"
+msgstr "Clean"
 
-#~ msgid "Which account to connect to on startup"
-#~ msgstr "Which account to connect to on startup"
+#: ../libempathy-gtk/empathy-theme-manager.c:73
+msgid "Blue"
+msgstr "Blue"
 
-#~ msgid "ACCOUNT-NAME"
-#~ msgstr "ACCOUNT-NAME"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "The identity provided by the chat server cannot be verified."
 
-#~ msgid "No accounts available."
-#~ msgstr "No accounts available."
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "The certificate is not signed by a Certification Authority."
 
-#~ msgid "Available accounts:"
-#~ msgstr "Available accounts:"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "The certificate has expired."
 
-#~ msgid "[default]"
-#~ msgstr "[default]"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "The certificate hasn't yet been activated."
 
-#~ msgid "There is no account with the name '%s'."
-#~ msgstr "There is no account with the name '%s'."
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "The certificate does not have the expected fingerprint."
 
-#, fuzzy
-#~ msgid "Join"
-#~ msgstr "_Join"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr ""
+"The hostname verified by the certificate doesn't match the server name."
 
-#, fuzzy
-#~ msgid "Create"
-#~ msgstr "Chat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "The certificate is self-signed."
 
-#, fuzzy
-#~ msgid "Chat Rooms"
-#~ msgstr "Chat Room:"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr ""
+"The certificate has been revoked by the issuing Certification Authority."
 
-#, fuzzy
-#~ msgid "Browsing for conference rooms, please wait..."
-#~ msgstr "Trying to join chat room, please wait..."
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "The certificate is cryptographically weak."
 
-#, fuzzy
-#~ msgid "Default"
-#~ msgstr "[default]"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "The certificate length exceeds verifiable limits."
 
-#, fuzzy
-#~ msgid "Chat!"
-#~ msgstr "Chat"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "The certificate is malformed."
 
-#~ msgid "%s wants to be added to your contact list."
-#~ msgstr "%s wants to be added to your contact list."
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "Expected hostname: %s"
 
-#~ msgid "Someone wants to be added to your contact list."
-#~ msgstr "Someone wants to be added to your contact list."
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "Certificate hostname: %s"
 
-#, fuzzy
-#~ msgid "Subscription request"
-#~ msgstr "Gossip - Subscription Request"
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "Continue"
+msgstr "Continue"
 
-#, fuzzy
-#~ msgid "Contact Information"
-#~ msgstr "Contact _Information"
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
 
-#~ msgid "Suggestions for the word"
-#~ msgstr "Suggestions for the word"
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "This connection is untrusted. Would you like to continue anyway?"
 
-#~ msgid "New subscription request from %s"
-#~ msgstr "New subscription request from %s"
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
+msgid "Remember this choice for future connections"
+msgstr "Remember this choice for future connections"
 
-#~ msgid "Do you want to add this person to your contact list?"
-#~ msgstr "Do you want to add this person to your contact list?"
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
+msgid "Certificate Details"
+msgstr "Certificate Details"
 
-#~ msgid "Do you want to add %s to your contact list?"
-#~ msgstr "Do you want to add %s to your contact list?"
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
+msgid "Unable to open URI"
+msgstr "Unable to open URI"
 
-#, fuzzy
-#~ msgid "Please enter your %s account password"
-#~ msgstr "Please enter your password:"
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
+msgid "Select a file"
+msgstr "Select a file"
 
-#~ msgid "Remember Password?"
-#~ msgstr "Remember Password?"
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
+msgid "Insufficient free space to save file"
+msgstr "Insufficient free space to save file"
 
-#~ msgid "Could not display the help contents."
-#~ msgstr "Could not display the help contents."
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
 
-#, fuzzy
-#~ msgid "Select Your Avatar Image"
-#~ msgstr "Select another and try again"
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#, c-format
+msgid "Incoming file from %s"
+msgstr "Incoming file from %s"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "Current Locale"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "Arabic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "Armenian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr "Baltic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr "Celtic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr "Central European"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "Chinese Simplified"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "Chinese Traditional"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr "Croatian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr "Cyrillic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr "Cyrillic/Russian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr "Cyrillic/Ukrainian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+msgid "Georgian"
+msgstr "Georgian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr "Greek"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr "Hebrew"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr "Hebrew Visual"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr "Icelandic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "Japanese"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:273
+#: ../libempathy-gtk/totem-subtitle-encoding.c:275
+#: ../libempathy-gtk/totem-subtitle-encoding.c:277
+#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+msgid "Korean"
+msgstr "Korean"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr "Nordic"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+msgid "Persian"
+msgstr "Persian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr "Romanian"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr "South European"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr "Thai"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr "Turkish"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+msgid "Western"
+msgstr "Western"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+msgid "No error message"
+msgstr "No error message"
+
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+msgid "Instant Message (Empathy)"
+msgstr "Instant Message (Empathy)"
+
+#: ../src/empathy.c:437
+msgid "Don't connect on startup"
+msgstr "Don't connect on startup"
 
-#~ msgid "The server does not seem to be responding."
-#~ msgstr "The server does not seem to be responding."
+#: ../src/empathy.c:441
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "Don't display the contact list or any other dialogs on startup"
 
-#~ msgid "Try again later."
-#~ msgstr "Try again later."
+#: ../src/empathy.c:456
+msgid "- Empathy IM Client"
+msgstr "- Empathy IM Client"
 
-#, fuzzy
-#~ msgid "Change"
-#~ msgstr "Chat"
+#: ../src/empathy.c:643
+msgid "Error contacting the Account Manager"
+msgstr "Error contacting the Account Manager"
 
-#~ msgid "Contact goes offline"
-#~ msgstr "Contact goes offline"
+#: ../src/empathy.c:645
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
+msgid ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public License as published by the Free Software "
+"Foundation; either version 2 of the License, or (at your option) any later "
+"version."
+msgstr ""
+"Empathy is free software; you can redistribute it and/or modify it under the "
+"terms of the GNU General Public Licence as published by the Free Software "
+"Foundation; either version 2 of the Licence, or (at your option) any later "
+"version."
+
+#: ../src/empathy-about-dialog.c:85
+msgid ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
+"details."
+msgstr ""
+"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
+"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
+"FOR A PARTICULAR PURPOSE.  See the GNU General Public Licence for more "
+"details."
 
-#~ msgid "Contact goes online"
-#~ msgstr "Contact goes online"
+#: ../src/empathy-about-dialog.c:89
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr ""
+"You should have received a copy of the GNU General Public Licence along with "
+"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#~ msgid "Contact ID:"
-#~ msgstr "Contact ID:"
+#: ../src/empathy-about-dialog.c:109
+msgid "An Instant Messaging client for GNOME"
+msgstr "An Instant Messaging client for GNOME"
 
-#~ msgid "Do you want to accept this file?"
-#~ msgstr "Do you want to accept this file?"
+#: ../src/empathy-about-dialog.c:115
+msgid "translator-credits"
+msgstr ""
+"Adam Weinberger\n"
+"Tiffany Antopolski"
 
-#, fuzzy
-#~ msgid "File Transfer Request"
-#~ msgstr "Gossip - File Transfer Request"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "There was an error while importing the accounts."
 
-#~ msgid "File name:"
-#~ msgstr "File name:"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "There was an error while parsing the account details."
 
-#~ msgid "File size:"
-#~ msgstr "File size:"
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "There was an error while creating the account."
 
-#, fuzzy
-#~ msgid "Not supported yet"
-#~ msgstr "Not supported yet."
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "There was an error."
 
-#~ msgid "This person wishes to send you this file:"
-#~ msgstr "This person wishes to send you this file:"
+#: ../src/empathy-account-assistant.c:179
+#, c-format
+msgid "The error message was: %s"
+msgstr "The error message was: %s"
 
-#~ msgid "Web site:"
-#~ msgstr "Web site:"
+#: ../src/empathy-account-assistant.c:183
+msgid ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
+msgstr ""
+"You can either go back and try to enter your accounts' details again or quit "
+"this assistant and add accounts later from the Edit menu."
 
-#~ msgid "_Accept"
-#~ msgstr "_Accept"
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1276
+msgid "An error occurred"
+msgstr "An error occurred"
 
-#~ msgid "_Deny"
-#~ msgstr "_Deny"
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
 
-#, fuzzy
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-account-assistant.c:475
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "Do you have any other chat accounts you want to set up?"
 
-#~ msgid "Account:"
-#~ msgstr "Account:"
+#: ../src/empathy-account-assistant.c:481
+msgid "Enter your account details"
+msgstr "Enter your account details"
 
-#, fuzzy
-#~ msgid "Browse:"
-#~ msgstr "Faroese"
+#: ../src/empathy-account-assistant.c:486
+msgid "What kind of chat account do you want to create?"
+msgstr "What kind of chat account do you want to create?"
 
-#, fuzzy
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-account-assistant.c:492
+msgid "Do you want to create other chat accounts?"
+msgstr "Do you want to create other chat accounts?"
 
-#, fuzzy
-#~ msgid "Group Chat"
-#~ msgstr "Gossip - Chat"
+#: ../src/empathy-account-assistant.c:499
+msgid "Enter the details for the new account"
+msgstr "Enter the details for the new account"
 
-#, fuzzy
-#~ msgid "Join New"
-#~ msgstr "_Join"
+#: ../src/empathy-account-assistant.c:614
+msgid ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+msgstr ""
+"With Empathy you can chat with people online nearby and with friends and "
+"colleagues who use Google Talk, AIM, Windows Live and many other chat "
+"programs. With a microphone or a webcam you can also have audio or video "
+"calls."
+
+#: ../src/empathy-account-assistant.c:631
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "Do you have an account you've been using with another chat program?"
+
+#: ../src/empathy-account-assistant.c:655
+msgid "Yes, import my account details from "
+msgstr "Yes, import my account details from "
+
+#: ../src/empathy-account-assistant.c:676
+msgid "Yes, I'll enter my account details now"
+msgstr "Yes, I'll enter my account details now"
+
+#: ../src/empathy-account-assistant.c:698
+msgid "No, I want a new account"
+msgstr "No, I want a new account"
+
+#: ../src/empathy-account-assistant.c:708
+msgid "No, I just want to see people online nearby for now"
+msgstr "No, I just want to see people online nearby for now"
+
+#: ../src/empathy-account-assistant.c:729
+msgid "Select the accounts you want to import:"
+msgstr "Select the accounts you want to import:"
+
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-account-assistant.c:823
+msgid "No, that's all for now"
+msgstr "No, that's all for now"
+
+#: ../src/empathy-account-assistant.c:1088
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy 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"
 
-#, fuzzy
-#~ msgid "Join room on start_up"
-#~ msgstr "Join Room on Start_up"
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
+msgid "Edit->Accounts"
+msgstr "Edit->Accounts"
 
-#~ msgid "N_ame:"
-#~ msgstr "N_ame:"
+#: ../src/empathy-account-assistant.c:1110
+msgid "I do _not want to enable this feature for now"
+msgstr "I do _not want to enable this feature for now"
 
-#~ msgid "S_erver:"
-#~ msgstr "S_erver:"
+#: ../src/empathy-account-assistant.c:1148
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+
+#: ../src/empathy-account-assistant.c:1154
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut not installed"
+
+#: ../src/empathy-account-assistant.c:1200
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "Messaging and VoIP Accounts Assistant"
+
+#: ../src/empathy-account-assistant.c:1234
+msgid "Welcome to Empathy"
+msgstr "Welcome to Empathy"
+
+#: ../src/empathy-account-assistant.c:1243
+msgid "Import your existing accounts"
+msgstr "Import your existing accounts"
+
+#: ../src/empathy-account-assistant.c:1261
+msgid "Please enter personal details"
+msgstr "Please enter personal details"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:69
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "There are unsaved modifications to your %s account."
+
+#. 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:73
+msgid "Your new account has not been saved yet."
+msgstr "Your new account has not been saved yet."
+
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
+msgid "Connecting…"
+msgstr "Connecting…"
+
+#: ../src/empathy-accounts-dialog.c:385
+#, c-format
+msgid "Offline — %s"
+msgstr "Offline — %s"
 
-#~ msgid "_Nickname:"
-#~ msgstr "_Nickname:"
+#: ../src/empathy-accounts-dialog.c:397
+#, c-format
+msgid "Disconnected — %s"
+msgstr "Disconnected — %s"
 
-#~ msgid "_Room:"
-#~ msgstr "_Room:"
+#: ../src/empathy-accounts-dialog.c:408
+msgid "Offline — No Network Connection"
+msgstr "Offline — No Network Connection"
 
-#~ msgid "-"
-#~ msgstr "-"
+#: ../src/empathy-accounts-dialog.c:415
+msgid "Unknown Status"
+msgstr "Unknown Status"
 
-#~ msgid "<b>About</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-accounts-dialog.c:427
+msgid "Offline — Account Disabled"
+msgstr "Offline — Account Disabled"
 
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "<b>Client Information</b>"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parametres"
 
-#, fuzzy
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>About</b>"
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Failed to retrieve your personal information from the server."
 
-#, fuzzy
-#~ msgid "<b>Name</b>"
-#~ msgstr "<b>Languages</b>"
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
 
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personal Details</b>"
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parametres..."
 
-#, fuzzy
-#~ msgid "<b>Subscription</b>"
-#~ msgstr "Connection"
+#: ../src/empathy-accounts-dialog.c:1289
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "Do you want to remove %s from your computer?"
 
-#~ msgid "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
-#~ msgstr "<span size=\"smaller\">Example: Mikael or user@server.org</span>"
+#: ../src/empathy-accounts-dialog.c:1293
+msgid "This will not remove your account on the server."
+msgstr "This will not remove your account on the server."
 
-#, fuzzy
-#~ msgid "Accou_nt:"
-#~ msgstr "Account:"
+#: ../src/empathy-accounts-dialog.c:1529
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 
-#, fuzzy
-#~ msgid "Add Contact"
-#~ msgstr "_Add Contact..."
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1705
+msgid "_Enable"
+msgstr "_Enable"
 
-#, fuzzy
-#~ msgid "Alia_s:"
-#~ msgstr "Alias:"
+#: ../src/empathy-accounts-dialog.c:1706
+msgid "_Disable"
+msgstr "_Disable"
 
-#~ msgid "Ch_at"
-#~ msgstr "Ch_at"
+#: ../src/empathy-accounts-dialog.c:2176
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
 
-#~ msgid "Client:"
-#~ msgstr "Client:"
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "Add…"
 
-#, fuzzy
-#~ msgid "Con_tact:"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Import…"
+msgstr "_Import…"
 
-#, fuzzy
-#~ msgid "Connect on S_tartup"
-#~ msgstr "Connect on Start_up"
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Protocol:"
+msgstr "Protocol:"
 
-#, fuzzy
-#~ msgid "Contacts"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
 
-#~ msgid "Country:"
-#~ msgstr "Country:"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "No protocol installed"
 
-#~ msgid "Decide _Later"
-#~ msgstr "Decide _Later"
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Loading account information"
+msgstr "Loading account information"
 
-#, fuzzy
-#~ msgid "Edit Contact"
-#~ msgstr "_Add Contact..."
+#: ../src/empathy-auth-client.c:286
+msgid " - Empathy authentication client"
+msgstr " - Empathy authentication client"
 
-#, fuzzy
-#~ msgid "Edit Groups"
-#~ msgstr "/_Edit Groups"
+#: ../src/empathy-auth-client.c:302
+msgid "Empathy authentication client"
+msgstr "Empathy authentication client"
 
-#~ msgid "Email:"
-#~ msgstr "Email:"
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "People nearby"
 
-#~ msgid "ID:"
-#~ msgstr "ID:"
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy Audio/Video Client"
 
-#~ msgid ""
-#~ "If you chose to decide later you will be asked the next time you log on."
-#~ msgstr ""
-#~ "If you chose to decide later you will be asked the next time you log on."
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy Audio/Video Client"
 
-#~ msgid "Name:"
-#~ msgstr "Name:"
+#: ../src/empathy-streamed-media-window.c:433
+msgid "Contrast"
+msgstr "Contrast"
 
-#~ msgid "OS:"
-#~ msgstr "OS:"
+#: ../src/empathy-streamed-media-window.c:436
+msgid "Brightness"
+msgstr "Brightness"
 
-#, fuzzy
-#~ msgid "Personal Details"
-#~ msgstr "Personal Details Saved!"
+#: ../src/empathy-streamed-media-window.c:439
+msgid "Gamma"
+msgstr "Gamma"
 
-#, fuzzy
-#~ msgid "R_egister"
-#~ msgstr "Registration Required"
+#: ../src/empathy-streamed-media-window.c:545
+msgid "Volume"
+msgstr "Volume"
 
-#, fuzzy
-#~ msgid "Search"
-#~ msgstr "_Search..."
+#: ../src/empathy-streamed-media-window.c:1097
+msgid "_Sidebar"
+msgstr "_Sidebar"
 
-#, fuzzy
-#~ msgid "Spell Checker"
-#~ msgstr "Spell Checking"
+#: ../src/empathy-streamed-media-window.c:1117
+msgid "Audio input"
+msgstr "Audio input"
 
-#, fuzzy
-#~ msgid "Subscription Request"
-#~ msgstr "Gossip - Subscription Request"
+#: ../src/empathy-streamed-media-window.c:1121
+msgid "Video input"
+msgstr "Video input"
 
-#~ msgid "Suggestions for the word:"
-#~ msgstr "Suggestions for the word:"
+#: ../src/empathy-streamed-media-window.c:1129
+msgid "Dialpad"
+msgstr "Dialpad"
 
-#, fuzzy
-#~ msgid ""
-#~ "This acts as a filter to the contact list below. You can use segments of "
-#~ "contact's name or ID, for example, \"jabber.org\" will list everyone "
-#~ "using that server"
-#~ msgstr ""
-#~ "This acts as a filter of the contact list below.  You can use segments of "
-#~ "contact's name or ID; for example, \"jabber.org\" will list everyone "
-#~ "using that server. "
+#: ../src/empathy-streamed-media-window.c:1140
+msgid "Details"
+msgstr "Details"
 
-#, fuzzy
-#~ msgid "This is the name that will be used on your roster for this contact"
-#~ msgstr "This is the name that will be used on your roster for this contact."
+#. 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:1209
+#: ../src/empathy-call-window.c:1927
+#, c-format
+msgid "Call with %s"
+msgstr "Call with %s"
+
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
+msgid "The IP address as seen by the machine"
+msgstr "The IP address as seen by the machine"
+
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
+msgid "The IP address as seen by a server on the Internet"
+msgstr "The IP address as seen by a server on the Internet"
+
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
+msgid "The IP address of the peer as seen by the other side"
+msgstr "The IP address of the peer as seen by the other side"
+
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
+msgid "The IP address of a relay server"
+msgstr "The IP address of a relay server"
+
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
+msgid "The IP address of the multicast group"
+msgstr "The IP address of the multicast group"
+
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
+msgid "Unknown"
+msgstr "Unknown"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-streamed-media-window.c:2139
+#, c-format
+msgid "Connected — %d:%02dm"
+msgstr "Connected — %d:%02dm"
 
-#, fuzzy
-#~ msgid "This name will be used to identify you in chat windows"
-#~ msgstr "This name will be used to identify you in chat windows."
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
+msgid "Technical Details"
+msgstr "Technical Details"
 
-#, fuzzy
-#~ msgid ""
-#~ "This name will be used to identify you when new contacts lookup your "
-#~ "details"
-#~ msgstr "This name will be used to identify you in chat windows."
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
 
-#~ msgid "Use system pro_xy"
-#~ msgstr "Use system pro_xy"
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
 
-#~ msgid "Version:"
-#~ msgstr "Version:"
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
 
-#, fuzzy
-#~ msgid "View Previous Conversations"
-#~ msgstr "_Conversation"
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
+msgid "There was a failure on the network"
+msgstr "There was a failure on the network"
 
-#, fuzzy
-#~ msgid "Which account do you want to use?"
-#~ msgstr "Which username do you want to use?"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr ""
+"The audio formats necessary for this call are not installed on your computer"
 
-#~ msgid "You are not subscribed to this contact."
-#~ msgstr "You are not subscribed to this contact."
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"The video formats necessary for this call are not installed on your computer"
 
-#~ msgid "_Connect"
-#~ msgstr "_Connect"
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
+msgid "There was a failure in the call engine"
+msgstr "There was a failure in the call engine"
+
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
+msgid "The end of the stream was reached"
+msgstr "The end of the stream was reached"
+
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
+msgid "Can't establish audio stream"
+msgstr "Can't establish audio stream"
+
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
+msgid "Can't establish video stream"
+msgstr "Can't establish video stream"
+
+#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-streamed-media-window.ui.h:1
+msgid "_Call"
+msgstr "_Call"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "_Microphone"
+msgstr "_Microphone"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "_Camera"
+msgstr "_Camera"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "_Settings"
+msgstr "_Settings"
+
+#: ../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 "_View"
+
+#: ../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 "_Help"
 
-#, fuzzy
-#~ msgid "_Description:"
-#~ msgstr "Description:"
+#: ../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 "_Contents"
 
-#~ msgid "_Disconnect"
-#~ msgstr "_Disconnect"
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debug"
+
+#: ../src/empathy-call-window.ui.h:10
+msgid "Swap camera"
+msgstr "Swap camera"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "Minimise me"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Maximise me"
+msgstr "Maximise me"
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Disable camera"
+msgstr "Disable camera"
+
+#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Hang up"
+
+#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Hang up current call"
+
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video call"
+
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start a video call"
+msgstr "Start a video call"
+
+#: ../src/empathy-call-window.ui.h:19
+msgid "Start an audio call"
+msgstr "Start an audio call"
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "Show dialpad"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send Video"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
+
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send Audio"
+
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
+
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
+
+#: ../src/empathy-call-window.ui.h:31
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
 
-#, fuzzy
-#~ msgid "_Email:"
-#~ msgstr "Email:"
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
 
-#, fuzzy
-#~ msgid ""
-#~ "_Enter the name or contact ID of the person you want to chat to below:"
-#~ msgstr ""
-#~ "Enter the name or contact ID of the person you want to chat with below:"
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
 
-#, fuzzy
-#~ msgid "_For:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Close window"
 
-#, fuzzy
-#~ msgid "_Full Name:"
-#~ msgstr "_Name:"
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "Leave room"
 
-#, fuzzy
-#~ msgid "_Group:"
-#~ msgstr "Group:"
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d unread)"
+msgstr[1] "%s (%d unread)"
 
-#, fuzzy
-#~ msgid "_Nick Name:"
-#~ msgstr "_Nickname:"
+#: ../src/empathy-chat-window.c:648
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (and %u other)"
+msgstr[1] "%s (and %u others)"
 
-#, fuzzy
-#~ msgid "_Password:"
-#~ msgstr "_Password:"
+#: ../src/empathy-chat-window.c:664
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d unread from others)"
+msgstr[1] "%s (%d unread from others)"
 
-#, fuzzy
-#~ msgid "_Quit Message:"
-#~ msgstr "_New Message..."
+#: ../src/empathy-chat-window.c:673
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d unread from all)"
+msgstr[1] "%s (%d unread from all)"
 
-#~ msgid "_Subscribe"
-#~ msgstr "_Subscribe"
+#: ../src/empathy-chat-window.c:888
+msgid "SMS:"
+msgstr "SMS:"
 
-#, fuzzy
-#~ msgid "_Web site:"
-#~ msgstr "Web site:"
+#: ../src/empathy-chat-window.c:898
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "Sending %d message"
+msgstr[1] "Sending %d messages"
 
-#~ msgid "Preset status messages"
-#~ msgstr "Preset status messages"
+#: ../src/empathy-chat-window.c:920
+msgid "Typing a message."
+msgstr "Typing a message."
 
-#~ msgid "Preset status messages."
-#~ msgstr "Preset status messages."
+#: ../src/empathy-chat-window.ui.h:1
+msgid "_Conversation"
+msgstr "_Conversation"
 
-#~ msgid "Connecting"
-#~ msgstr "Connecting"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_lear"
+msgstr "C_lear"
 
-#~ msgid "Perhaps you are trying to connect to the wrong port?"
-#~ msgstr "Perhaps you are trying to connect to the wrong port?"
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "Insert _Smiley"
 
-#~ msgid "Perhaps the service is not currently running?"
-#~ msgstr "Perhaps the service is not currently running?"
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
 
-#~ msgid "Check your connection details."
-#~ msgstr "Check your connection details."
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
 
-#~ msgid "Perhaps the server is not running this service."
-#~ msgstr "Perhaps the server is not running this service."
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
 
-#~ msgid "Check your username and password are correct."
-#~ msgstr "Ensure that your username and password are correct."
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Invite _Participant…"
+msgstr "Invite _Participant…"
 
-#~ msgid "%s will be added to your contact list."
-#~ msgstr "%s will be added to your contact list."
+#: ../src/empathy-chat-window.ui.h:8
+msgid "C_ontact"
+msgstr "C_ontact"
 
-#~ msgid "%s ID of new contact:"
-#~ msgstr "%s ID of new contact:"
+#: ../src/empathy-chat-window.ui.h:10
+msgid "_Tabs"
+msgstr "_Tabs"
 
-#~ msgid "Example: %s"
-#~ msgstr "Example: %s"
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
 
-#~ msgid "You have no Instant Messaging accounts configured!"
-#~ msgstr "You have no Instant Messaging accounts configured!"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "_Next Tab"
 
-#~ msgid ""
-#~ "Next you will be presented with the Account Information dialog to set "
-#~ "your details up."
-#~ msgstr ""
-#~ "Next you will be presented with the Account Information dialogue to set "
-#~ "up your details."
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Undo Close Tab"
 
-#~ msgid ""
-#~ "Please enter your invitation message to:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter your invitation message to:\n"
-#~ "%s"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
-#, fuzzy
-#~ msgid "Favourite"
-#~ msgstr "_Add to Favourites"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
-#~ msgid "Contact Information for %s"
-#~ msgstr "Contact Information for %s"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
 
-#, fuzzy
-#~ msgid "/Contact Infor_mation"
-#~ msgstr "/Contact _Information"
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "Name"
 
-#~ msgid "/Re_name Contact"
-#~ msgstr "/Re_name Contact"
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "Room"
 
-#~ msgid "/_Edit Groups"
-#~ msgstr "/_Edit Groups"
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "Auto-Connect"
 
-#, fuzzy
-#~ msgid "/_View Previous Conversations"
-#~ msgstr "_Conversation"
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "Manage Favourite Rooms"
 
-#~ msgid ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#~ msgid "Edit groups for %s"
-#~ msgstr "Edit groups for %s"
-
-#~ msgid "Conversation Log"
-#~ msgstr "Conversation Log"
-
-#~ msgid "Registering account"
-#~ msgstr "Registering account"
-
-#, fuzzy
-#~ msgid "Respond"
-#~ msgstr "Reason:"
-
-#, fuzzy
-#~ msgid "Add to _favourites"
-#~ msgstr "_Add to Favourites"
-
-#, fuzzy
-#~ msgid ""
-#~ "Customize your own nickname, the server and chatroom which you wish to "
-#~ "join."
-#~ msgstr ""
-#~ "Pick a saved chat room or customize your own nickname, server and chat "
-#~ "room to join."
-
-#, fuzzy
-#~ msgid "Na_me:"
-#~ msgstr "Name:"
-
-#, fuzzy
-#~ msgid "New Chat Room"
-#~ msgstr "Chat Room:"
-
-#, fuzzy
-#~ msgid ""
-#~ "Pick a saved chat room from the presets available below and click Join to "
-#~ "start chatting."
-#~ msgstr ""
-#~ "Pick a saved chat room or customize your own nickname, server and chat "
-#~ "room to join."
-
-#~ msgid "    "
-#~ msgstr "    "
-
-#~ msgid "<b>Information requested, please wait...</b>"
-#~ msgstr "<b>Information requested, please wait...</b>"
-
-#, fuzzy
-#~ msgid "<span size=\"smaller\">Example:</span>"
-#~ msgstr "<span size=\"smaller\">Example: user@jabber.org</span>"
-
-#~ msgid "Account Name"
-#~ msgstr "Account Name"
-
-#, fuzzy
-#~ msgid "Chat Rooms..."
-#~ msgstr "Chat Room:"
-
-#, fuzzy
-#~ msgid "Connection Details"
-#~ msgstr "Connection"
-
-#~ msgid "Do you already have an account set up on a server?"
-#~ msgstr "Do you already have an account set up on a server?"
-
-#, fuzzy
-#~ msgid "Enter the port used in the connection for this account"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Enter the server used in the connection for this account"
-#~ msgstr ""
-#~ "Please enter a new nickname for the contact\n"
-#~ "%s"
-
-#~ msgid "Enter the user's contact ID:"
-#~ msgstr "Enter the user's contact ID:"
-
-#~ msgid "Finished"
-#~ msgstr "Finished"
-
-#~ msgid "Gossip"
-#~ msgstr "Gossip"
-
-#~ msgid ""
-#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
-#~ "\n"
-#~ "This assistant will help you configure Gossip and connect you to your "
-#~ "favorite Jabber server.\n"
-#~ "\n"
-#~ "To get started, just click \"Forward\"."
-#~ msgstr ""
-#~ "Gossip is a modern client for the Jabber Instant Messaging system.\n"
-#~ "\n"
-#~ "This assistant will help you configure Gossip and connect you to your "
-#~ "favourite Jabber server.\n"
-#~ "\n"
-#~ "To get started, just click \"Forward\"."
-
-#~ msgid ""
-#~ "In order to subscribe to presence notifications from the user, a request "
-#~ "will be sent. Until this request is approved, the user will always be "
-#~ "shown as \"Offline\" in your contact list."
-#~ msgstr ""
-#~ "In order to subscribe to presence notifications from the user, a request "
-#~ "will be sent. Until this request is approved, the user will always be "
-#~ "shown as \"Offline\" in your contact list."
-
-#~ msgid "In which group do you want to place this contact?"
-#~ msgstr "In which group do you want to place this contact?"
+#: ../src/empathy-event-manager.c:523
+msgid "Incoming video call"
+msgstr "Incoming video call"
 
-#~ msgid "Jabber ID:"
-#~ msgstr "Jabber ID:"
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+msgid "Incoming call"
+msgstr "Incoming call"
 
-#~ msgid "Nickname:"
-#~ msgstr "Nickname:"
+#: ../src/empathy-event-manager.c:527
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s is video calling you. Do you want to answer?"
 
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-event-manager.c:528
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s is calling you. Do you want to answer?"
 
-#, fuzzy
-#~ msgid "Press Subscribe to request to receive their status"
-#~ msgstr "Press Subscribe to request to receive their status."
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#, c-format
+msgid "Incoming call from %s"
+msgstr "Incoming call from %s"
 
-#, fuzzy
-#~ msgid "Registering Account"
-#~ msgstr "Registering account"
+#: ../src/empathy-event-manager.c:556
+msgid "_Reject"
+msgstr "_Reject"
 
-#, fuzzy
-#~ msgid "Resource:"
-#~ msgstr "R_esource:"
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+msgid "_Answer"
+msgstr "_Answer"
 
-#~ msgid "Sending request"
-#~ msgstr "Sending request"
+#: ../src/empathy-event-manager.c:572
+msgid "_Answer with video"
+msgstr "_Answer with video"
 
-#, fuzzy
-#~ msgid "Server:"
-#~ msgstr "_Server:"
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "Incoming video call from %s"
 
-#~ msgid "Web Site:"
-#~ msgstr "Web Site:"
+#: ../src/empathy-event-manager.c:838
+msgid "Room invitation"
+msgstr "Room invitation"
 
-#~ msgid "Welcome to Gossip"
-#~ msgstr "Welcome to Gossip"
+#: ../src/empathy-event-manager.c:840
+#, c-format
+msgid "Invitation to join %s"
+msgstr "Invitation to join %s"
 
-#~ msgid "What instant messaging system does the contact use?"
-#~ msgstr "Which instant messaging system does the contact use?"
+#: ../src/empathy-event-manager.c:847
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s is inviting you to join %s"
 
-#~ msgid "What is your name?"
-#~ msgstr "What is your name?"
+#: ../src/empathy-event-manager.c:855
+msgid "_Decline"
+msgstr "_Decline"
 
-#, fuzzy
-#~ msgid "What password do you want to use?"
-#~ msgstr "What server do you want to use?"
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Join"
+msgstr "_Join"
 
-#~ msgid "What username do you use?"
-#~ msgstr "What username do you use?"
+#: ../src/empathy-event-manager.c:887
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s invited you to join %s"
 
-#~ msgid "What username do you want to use?"
-#~ msgstr "Which username do you want to use?"
+#: ../src/empathy-event-manager.c:893
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "You have been invited to join %s"
 
-#~ msgid "Which account do you want to add this contact to?"
-#~ msgstr "To which account do you want to add this contact?"
+#: ../src/empathy-event-manager.c:944
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "Incoming file transfer from %s"
 
-#~ msgid ""
-#~ "You can change your account settings later by selecting the Edit-"
-#~ ">Accounts menu item."
-#~ msgstr ""
-#~ "You can change your account settings later by selecting the Edit-"
-#~ ">Accounts menu item."
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
+msgid "Password required"
+msgstr "Password required"
 
-#~ msgid "Your Account"
-#~ msgstr "Your Account"
+#: ../src/empathy-event-manager.c:1217
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s would like permission to see when you are online"
 
-#~ msgid "Your Identity"
-#~ msgstr "Your Identity"
+#: ../src/empathy-event-manager.c:1223
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"Message: %s"
 
-#~ msgid "Your new account has now been set up."
-#~ msgstr "Your new account has now been set up."
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:99
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
 
-#, fuzzy
-#~ msgid "_Group Chat"
-#~ msgstr "Gossip - Chat"
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:102
+#, c-format
+msgid "%02u.%02u"
+msgstr "%02u.%02u"
 
-#~ msgid "_No"
-#~ msgstr "_No"
+#: ../src/empathy-ft-manager.c:178
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "Unknown"
 
-#~ msgid "_Search..."
-#~ msgstr "_Search..."
+#: ../src/empathy-ft-manager.c:273
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%s of %s at %s/s"
 
-#~ msgid "_Yes"
-#~ msgstr "_Yes"
+#: ../src/empathy-ft-manager.c:274
+#, c-format
+msgid "%s of %s"
+msgstr "%s of %s"
 
-#~ msgid "Be silent when away"
-#~ msgstr "Be silent when away"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:305
+#, c-format
+msgid "Receiving \"%s\" from %s"
+msgstr "Receiving \"%s\" from %s"
 
-#~ msgid "Be silent when busy"
-#~ msgstr "Be silent when busy"
+#. translators: first %s is filename, second %s is the contact name
+#: ../src/empathy-ft-manager.c:308
+#, c-format
+msgid "Sending \"%s\" to %s"
+msgstr "Sending \"%s\" to %s"
 
-#~ msgid "Height of main window"
-#~ msgstr "Height of main window"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:338
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "Error receiving \"%s\" from %s"
 
-#~ msgid "The X position of the main window."
-#~ msgstr "The X position of the main window."
+#: ../src/empathy-ft-manager.c:341
+msgid "Error receiving a file"
+msgstr "Error receiving a file"
 
-#~ msgid "The Y position of the main window."
-#~ msgstr "The Y position of the main window."
+#: ../src/empathy-ft-manager.c:346
+#, c-format
+msgid "Error sending \"%s\" to %s"
+msgstr "Error sending \"%s\" to %s"
 
-#~ msgid "The width of the main window."
-#~ msgstr "The width of the main window."
+#: ../src/empathy-ft-manager.c:349
+msgid "Error sending a file"
+msgstr "Error sending a file"
 
-#~ msgid "Whether spell checking should be turned on."
-#~ msgstr "Whether spell checking should be enabled."
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:488
+#, c-format
+msgid "\"%s\" received from %s"
+msgstr "\"%s\" received from %s"
 
-#~ msgid "Width of the main window"
-#~ msgstr "Width of the main window"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:493
+#, c-format
+msgid "\"%s\" sent to %s"
+msgstr "\"%s\" sent to %s"
 
-#~ msgid "X position of main window"
-#~ msgstr "X position of main window"
+#: ../src/empathy-ft-manager.c:496
+msgid "File transfer completed"
+msgstr "File transfer completed"
 
-#~ msgid "Y position of main window"
-#~ msgstr "Y position of main window"
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+msgid "Waiting for the other participant's response"
+msgstr "Waiting for the other participant's response"
 
-#~ msgid "Gossip, Instant Messaging Client"
-#~ msgstr "Gossip, Instant Messaging Client"
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#, c-format
+msgid "Checking integrity of \"%s\""
+msgstr "Checking integrity of \"%s\""
 
-#, fuzzy
-#~ msgid "Close this chat window"
-#~ msgstr "_Invite to Chat Room"
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#, c-format
+msgid "Hashing \"%s\""
+msgstr "Hashing \"%s\""
 
-#~ msgid "Requested Information"
-#~ msgstr "Requested Information"
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
 
-#~ msgid "/_Invite to Chat Conference"
-#~ msgstr "/_Invite to Chat Conference"
+#: ../src/empathy-ft-manager.c:1037
+msgid "File"
+msgstr "File"
 
-#, fuzzy
-#~ msgid "Send Message"
-#~ msgstr "_New Message..."
+#: ../src/empathy-ft-manager.c:1059
+msgid "Remaining"
+msgstr "Remaining"
 
-#, fuzzy
-#~ msgid "%s has gone offline"
-#~ msgstr "%s went offline"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "File Transfers"
 
-#~ msgid "Contact _Information"
-#~ msgstr "Contact _Information"
+#: ../src/empathy-ft-manager.ui.h:2
+msgid "Remove completed, canceled and failed file transfers from the list"
+msgstr "Remove completed, cancellled and failed file transfers from the list"
 
-#~ msgid "<b>Sound</b>"
-#~ msgstr "<b>Sound</b>"
+#: ../src/empathy-import-dialog.c:84
+msgid ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
+msgstr ""
+"No accounts to import could be found. Empathy currently only supports "
+"importing accounts from Pidgin."
 
-#~ msgid "Check spelling while I _type"
-#~ msgstr "Check spelling while I _type"
+#: ../src/empathy-import-dialog.c:199
+msgid "Import Accounts"
+msgstr "Import Accounts"
 
-#~ msgid "Gossip - Accounts"
-#~ msgstr "Gossip - Accounts"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:315
+msgid "Import"
+msgstr "Import"
 
-#, fuzzy
-#~ msgid "Join _Group Chat..."
-#~ msgstr "_Join Group Chat..."
+#: ../src/empathy-import-widget.c:324
+msgid "Protocol"
+msgstr "Protocol"
 
-#~ msgid "Por_t:"
-#~ msgstr "Por_t:"
+#: ../src/empathy-import-widget.c:348
+msgid "Source"
+msgstr "Source"
 
-#~ msgid "Requested information."
-#~ msgstr "Requested information."
+#: ../src/empathy-roster-window.c:389
+msgid "Provide Password"
+msgstr "Provide Password"
 
-#~ msgid "Requesting contact information, please wait..."
-#~ msgstr "Requesting contact information, please wait..."
+#: ../src/empathy-roster-window.c:395
+msgid "Disconnect"
+msgstr "Disconnect"
 
-#~ msgid "Could not open connection"
-#~ msgstr "Could not open connection"
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
 
-#~ msgid "Could not find the server you wanted to use"
-#~ msgstr "Could not find the server you wanted to use"
+#: ../src/empathy-roster-window.c:660
+msgid "No match found"
+msgstr "No match found"
 
-#~ msgid "Connection to the server failed."
-#~ msgstr "Connection to the server failed."
+#: ../src/empathy-roster-window.c:765
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
 
-#~ msgid "Authentication failed"
-#~ msgstr "Authentication failed"
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "Update software..."
 
-#~ msgid "Written by:"
-#~ msgstr "Written by:"
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "Close"
 
-#~ msgid "Artwork by:"
-#~ msgstr "Artwork by:"
+#: ../src/empathy-roster-window.c:942
+msgid "Reconnect"
+msgstr "Reconnect"
 
-#~ msgid "Translated by:"
-#~ msgstr "Translated by:"
+#: ../src/empathy-roster-window.c:948
+msgid "Edit Account"
+msgstr "Edit Account"
 
-#~ msgid "Account ID"
-#~ msgstr "Account ID"
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "Top up %s (%s)..."
 
-#~ msgid "Last Error"
-#~ msgstr "Last Error"
+#: ../src/empathy-roster-window.c:1138
+msgid "Top up account credit"
+msgstr "Top up account credit"
 
-#~ msgid "%sChat - %s"
-#~ msgstr "%sChat - %s"
+#. top up button
+#: ../src/empathy-roster-window.c:1210
+msgid "Top Up..."
+msgstr "Top Up..."
 
-#~ msgid "/Show _Log"
-#~ msgstr "/Show _Log"
+#: ../src/empathy-roster-window.c:1933
+msgid "Contact"
+msgstr "Contact"
 
-#~ msgid "Afrikaans"
-#~ msgstr "Afrikaans"
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
 
-#~ msgid "Amharic"
-#~ msgstr "Amharic"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "You need to enable %s to see contacts here."
 
-#~ msgid "Arabic"
-#~ msgstr "Arabic"
+#: ../src/empathy-roster-window.c:2419
+msgid "Contact List"
+msgstr "Contact List"
 
-#~ msgid "Azerbaijani"
-#~ msgstr "Azerbaijani"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
 
-#~ msgid "Belarusian"
-#~ msgstr "Belarusian"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_New Conversation…"
 
-#~ msgid "Bulgarian"
-#~ msgstr "Bulgarian"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "New _Call…"
 
-#~ msgid "Bengali"
-#~ msgstr "Bengali"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Search for Contacts…"
 
-#~ msgid "Breton"
-#~ msgstr "Breton"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_File Transfers"
 
-#~ msgid "Bosnian"
-#~ msgstr "Bosnian"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Offline Contacts"
 
-#~ msgid "Catalan"
-#~ msgstr "Catalan"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
 
-#~ msgid "Czech"
-#~ msgstr "Czech"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Credit Balance"
 
-#~ msgid "Welsh"
-#~ msgstr "Welsh"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contacts on a _Map"
 
-#~ msgid "Danish"
-#~ msgstr "Danish"
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
 
-#~ msgid "German"
-#~ msgstr "German"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
 
-#~ msgid "German (Austria)"
-#~ msgstr "German (Austria)"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "P_references"
 
-#~ msgid "German (Germany)"
-#~ msgstr "German (Germany)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
 
-#~ msgid "German (Swiss)"
-#~ msgstr "German (Swiss)"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Sort by _Name"
 
-#~ msgid "Greek"
-#~ msgstr "Greek"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Sort by _Status"
 
-#~ msgid "English"
-#~ msgstr "English"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal Size With _Avatars"
 
-#~ msgid "English (Canadian)"
-#~ msgstr "English (Canadian)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal Size"
 
-#~ msgid "English (British)"
-#~ msgstr "English (British)"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Compact Size"
 
-#~ msgid "English (American)"
-#~ msgstr "English (American)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Room"
 
-#~ msgid "Esperanto"
-#~ msgstr "Esperanto"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Join…"
 
-#~ msgid "Spanish"
-#~ msgstr "Spanish"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
 
-#~ msgid "Estonian"
-#~ msgstr "Estonian"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
 
-#~ msgid "Persian"
-#~ msgstr "Persian"
+#: ../src/empathy-new-chatroom-dialog.c:369
+msgid "Chat Room"
+msgstr "Chat Room"
 
-#~ msgid "Finnish"
-#~ msgstr "Finnish"
+#: ../src/empathy-new-chatroom-dialog.c:385
+msgid "Members"
+msgstr "Members"
 
-#~ msgid "French"
-#~ msgstr "French"
+#. 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
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
 
-#~ msgid "French (France)"
-#~ msgstr "French (France)"
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "No"
+msgstr "No"
 
-#~ msgid "French (Swiss)"
-#~ msgstr "French (Swiss)"
+#: ../src/empathy-new-chatroom-dialog.c:668
+msgid "Could not start room listing"
+msgstr "Could not start room listing"
 
-#~ msgid "Irish Gaelic"
-#~ msgstr "Irish Gaelic"
+#: ../src/empathy-new-chatroom-dialog.c:678
+msgid "Could not stop room listing"
+msgstr "Could not stop room listing"
 
-#~ msgid "Scots Gaelic"
-#~ msgstr "Scots Gaelic"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Join Room"
 
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr ""
+"Enter the room name to join here or click on one or more rooms in the list."
 
-#~ msgid "Manx Gaelic"
-#~ msgstr "Manx Gaelic"
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Room:"
 
-#~ msgid "Hebrew"
-#~ msgstr "Hebrew"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
 
-#~ msgid "Hindi"
-#~ msgstr "Hindi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
 
-#~ msgid "Croatian"
-#~ msgstr "Croatian"
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "Room List"
+msgstr "Room List"
 
-#~ msgid "Hungarian"
-#~ msgstr "Hungarian"
+#: ../src/empathy-preferences.c:166
+msgid "Message received"
+msgstr "Message received"
 
-#~ msgid "Indonesian"
-#~ msgstr "Indonesian"
+#: ../src/empathy-preferences.c:167
+msgid "Message sent"
+msgstr "Message sent"
 
-#~ msgid "Icelandic"
-#~ msgstr "Icelandic"
+#: ../src/empathy-preferences.c:168
+msgid "New conversation"
+msgstr "New conversation"
 
-#~ msgid "Italian"
-#~ msgstr "Italian"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Contact comes online"
 
-#~ msgid "Japanese"
-#~ msgstr "Japanese"
+#: ../src/empathy-preferences.c:170
+msgid "Contact goes offline"
+msgstr "Contact goes offline"
 
-#~ msgid "Georgian"
-#~ msgstr "Georgian"
+#: ../src/empathy-preferences.c:171
+msgid "Account connected"
+msgstr "Account connected"
 
-#~ msgid "Kannada"
-#~ msgstr "Kannada"
+#: ../src/empathy-preferences.c:172
+msgid "Account disconnected"
+msgstr "Account disconnected"
 
-#~ msgid "Korean"
-#~ msgstr "Korean"
+#: ../src/empathy-preferences.c:475
+msgid "Language"
+msgstr "Language"
 
-#~ msgid "Kurdish"
-#~ msgstr "Kurdish"
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "Juliet"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "Romeo"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "Juliet has disconnected"
+
+#: ../src/empathy-preferences.c:1159
+msgid "Preferences"
+msgstr "Preferences"
 
-#~ msgid "Cornish"
-#~ msgstr "Cornish"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
 
-#~ msgid "Limburgish"
-#~ msgstr "Limburgish"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
 
-#~ msgid "Lithuanian"
-#~ msgstr "Lithuanian"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Appearance"
+msgstr "Appearance"
 
-#~ msgid "Latvian"
-#~ msgstr "Latvian"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Start chats in:"
 
-#~ msgid "Maori"
-#~ msgstr "Maori"
+#: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "new ta_bs"
 
-#~ msgid "Macedonian"
-#~ msgstr "Macedonian"
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "new _windows"
 
-#~ msgid "Malayalam"
-#~ msgstr "Malayalam"
+#: ../src/empathy-preferences.ui.h:7
+msgid "Display incoming events in the notification area"
+msgstr "Display incoming events in the notification area"
 
-#~ msgid "Mongolian"
-#~ msgstr "Mongolian"
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
 
-#~ msgid "Marathi"
-#~ msgstr "Marathi"
+#: ../src/empathy-preferences.ui.h:9
+msgid "Log conversations"
+msgstr "Log conversations"
 
-#~ msgid "Malay"
-#~ msgstr "Malay"
+#: ../src/empathy-preferences.ui.h:10
+msgid "Behavior"
+msgstr "Behaviour"
 
-#~ msgid "Norwegian (Bokmal)"
-#~ msgstr "Norwegian (Bokmal)"
+#: ../src/empathy-preferences.ui.h:11
+msgid "General"
+msgstr "General"
 
-#~ msgid "Nepali"
-#~ msgstr "Nepali"
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
 
-#~ msgid "Dutch"
-#~ msgstr "Dutch"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
 
-#~ msgid "Norwegian"
-#~ msgstr "Norwegian"
+#: ../src/empathy-preferences.ui.h:14
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
 
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "Norwegian (Nynorsk)"
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
 
-#~ msgid "Norwegian (Nyorsk)"
-#~ msgstr "Norwegian (Nyorsk)"
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
 
-#~ msgid "Oriya"
-#~ msgstr "Oriya"
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifications"
 
-#~ msgid "Punjabi"
-#~ msgstr "Punjabi"
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
 
-#~ msgid "Polish"
-#~ msgstr "Polish"
+#: ../src/empathy-preferences.ui.h:19
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
 
-#~ msgid "Portuguese"
-#~ msgstr "Portuguese"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Play sound for events"
+msgstr "Play sound for events"
 
-#~ msgid "Portuguese (Portugal)"
-#~ msgstr "Portuguese (Portugal)"
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sounds"
 
-#~ msgid "Portuguese (Brazil)"
-#~ msgstr "Portuguese (Brazil)"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellllation to improve call quality"
 
-#~ msgid "Romanian"
-#~ msgstr "Romanian"
+#: ../src/empathy-preferences.ui.h:23
+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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Echo cancellllation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo "
+"cancellllation off and restarting the call."
 
-#~ msgid "Russian"
-#~ msgstr "Russian"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
 
-#~ msgid "Kinyarwanda"
-#~ msgstr "Kinyarwanda"
+#: ../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 ""
+"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."
 
-#~ msgid "Slovak"
-#~ msgstr "Slovak"
+#. 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 "_Reduce location accuracy"
 
-#~ msgid "Slovenian"
-#~ msgstr "Slovenian"
+#: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "Privacy"
 
-#~ msgid "Albanian"
-#~ msgstr "Albanian"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_GPS"
+msgstr "_GPS"
 
-#~ msgid "Serbian"
-#~ msgstr "Serbian"
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "_Cellphone"
 
-#~ msgid "Swedish"
-#~ msgstr "Swedish"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
 
-#~ msgid "Tamil"
-#~ msgstr "Tamil"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Location sources:"
 
-#~ msgid "Telugu"
-#~ msgstr "Telugu"
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 
-#~ msgid "Thai"
-#~ msgstr "Thai"
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
 
-#~ msgid "Turkmen"
-#~ msgstr "Turkmen"
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
-#~ msgid "Turkish"
-#~ msgstr "Turkish"
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Ukrainian"
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
 
-#~ msgid "Vietnamese"
-#~ msgstr "Vietnamese"
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Themes"
 
-#~ msgid "Wallon"
-#~ msgstr "Wallon"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "Status"
 
-#~ msgid "Xhosa"
-#~ msgstr "Xhosa"
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "_Quit"
 
-#~ msgid "Yiddish"
-#~ msgstr "Yiddish"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Redial"
+msgstr "Redial"
 
-#~ msgid "Chinese Simplified"
-#~ msgstr "Chinese Simplified"
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#~ msgid "Chinese Traditional"
-#~ msgstr "Chinese Traditional"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video Off"
 
-#~ msgid "View Lo_g"
-#~ msgstr "View Lo_g"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Video Preview"
+msgstr "Video Preview"
 
-#, fuzzy
-#~ msgid "Gossip - Chat Rooms"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Video On"
+msgstr "Video On"
 
-#~ msgid "Gossip - Group Chat"
-#~ msgstr "Gossip - Group Chat"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Call the contact again"
 
-#, fuzzy
-#~ msgid "Gossip - New Chatroom"
-#~ msgstr "Gossip - Edit Chat Room"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Camera Off"
+msgstr "Camera Off"
 
-#~ msgid "Gossip - Add contact"
-#~ msgstr "Gossip - Add contact"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
 
-#~ msgid "Gossip - Contact Information"
-#~ msgstr "Gossip - Contact Information"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Preview"
 
-#~ msgid "Gossip - Edit Groups"
-#~ msgstr "Gossip - Edit Groups"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
 
-#~ msgid "Gossip - New Account"
-#~ msgstr "Gossip - New Account"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Camera On"
 
-#~ msgid "Gossip - New Message"
-#~ msgstr "Gossip - New Message"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
 
-#~ msgid "Gossip - Personal Details"
-#~ msgstr "Gossip - Personal Details"
+#: ../src/empathy-map-view.c:471
+msgid "Contact Map View"
+msgstr "Contact Map View"
 
-#~ msgid "Gossip - Preferences"
-#~ msgstr "Gossip - Preferences"
+#: ../src/empathy-debug-window.c:1228
+msgid "Save"
+msgstr "Save"
 
-#~ msgid "Gossip - Spell Checker"
-#~ msgstr "Gossip - Spell Checker"
+#: ../src/empathy-debug-window.c:1435
+msgid "Debug Window"
+msgstr "Debug Window"
 
-#~ msgid "Gossip - Status Message"
-#~ msgstr "Gossip - Status Message"
+#: ../src/empathy-debug-window.c:1517
+msgid "Pause"
+msgstr "Pause"
 
-#~ msgid "Waiting for server to respond, please wait..."
-#~ msgstr "Waiting for server to respond; please wait..."
+#: ../src/empathy-debug-window.c:1529
+msgid "Level "
+msgstr "Level "
 
-#~ msgid "Connection could not be created"
-#~ msgstr "Connection could not be created"
+#: ../src/empathy-debug-window.c:1549
+msgid "Debug"
+msgstr "Debug"
 
-#~ msgid "Redirect"
-#~ msgstr "Redirect"
+#: ../src/empathy-debug-window.c:1555
+msgid "Info"
+msgstr "Info"
 
-#~ msgid "Bad Request"
-#~ msgstr "Bad Request"
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+msgid "Message"
+msgstr "Message"
 
-#~ msgid "Not Authorized"
-#~ msgstr "Not Authorized"
+#: ../src/empathy-debug-window.c:1567
+msgid "Warning"
+msgstr "Warning"
 
-#~ msgid "Payment Required"
-#~ msgstr "Payment Required"
+#: ../src/empathy-debug-window.c:1573
+msgid "Critical"
+msgstr "Critical"
 
-#~ msgid "Forbidden"
-#~ msgstr "Forbidden"
+#: ../src/empathy-debug-window.c:1579
+msgid "Error"
+msgstr "Error"
 
-#~ msgid "Not Found"
-#~ msgstr "Not Found"
+#: ../src/empathy-debug-window.c:1598
+msgid "Time"
+msgstr "Time"
 
-#~ msgid "Not Allowed"
-#~ msgstr "Not Allowed"
+#: ../src/empathy-debug-window.c:1601
+msgid "Domain"
+msgstr "Domain"
 
-#~ msgid "Not Acceptable"
-#~ msgstr "Not Acceptable"
+#: ../src/empathy-debug-window.c:1603
+msgid "Category"
+msgstr "Category"
 
-#~ msgid "Request Timeout"
-#~ msgstr "Request Timeout"
+#: ../src/empathy-debug-window.c:1605
+msgid "Level"
+msgstr "Level"
 
-#~ msgid "Conflict"
-#~ msgstr "Conflict"
+#: ../src/empathy-debug-window.c:1642
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"The selected connection manager does not support the remote debugging "
+"extension."
 
-#~ msgid "Not Implemented"
-#~ msgstr "Not Implemented"
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
+msgid "Invite Participant"
+msgstr "Invite Participant"
 
-#~ msgid "Remote Server Error"
-#~ msgstr "Remote Server Error"
+#: ../src/empathy-invite-participant-dialog.c:201
+msgid "Choose a contact to invite into the conversation:"
+msgstr "Choose a contact to invite into the conversation:"
 
-#~ msgid "Unknown error."
-#~ msgstr "Unknown error."
+#: ../src/empathy-invite-participant-dialog.c:224
+msgid "Invite"
+msgstr "Invite"
 
-#~ msgid "Custom"
-#~ msgstr "Custom"
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "Don't display any dialogs; do any work (eg, importing) and exit"
 
-#~ msgid "The chat room you are trying is not responding."
-#~ msgstr "The chat room you are trying is not responding."
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
 
-#~ msgid "Check your details and try again."
-#~ msgstr "Check your details and try again."
+#: ../src/empathy-accounts.c:191
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:193
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "Show account assistant"
+
+#: ../src/empathy-accounts.c:202
+msgid "- Empathy Accounts"
+msgstr "- Empathy Accounts"
+
+#: ../src/empathy-accounts.c:238
+msgid "Empathy Accounts"
+msgstr "Empathy Accounts"
+
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "Show a particular service"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy Debugger"
+
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy Debugger"
+
+#: ../src/empathy-chat.c:107
+msgid "- Empathy Chat Client"
+msgstr "- Empathy Chat Client"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Respond"
+msgstr "Respond"
+
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
+msgid "Reject"
+msgstr "Reject"
+
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
+msgid "Answer"
+msgstr "Answer"
+
+#: ../src/empathy-notifications-approver.c:214
+msgid "Answer with video"
+msgstr "Answer with video"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
+msgid "Decline"
+msgstr "Decline"
+
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
+msgid "Accept"
+msgstr "Accept"
+
+#. 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:247
+msgid "Provide"
+msgstr "Provide"
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s just tried to call you, but you were in another call."
 
-#~ msgid "This is currently unsupported."
-#~ msgstr "This is currently unsupported."
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+msgid "i"
+msgstr "i"
 
-#~ msgid "Perhaps the conference server is busy, try again later."
-#~ msgstr "Perhaps the conference server is busy; try again later."
+#: ../src/empathy-call-window.c:2929
+msgid "On hold"
+msgstr "On hold"
 
-#~ msgid "Check the server host name is correct and is available."
-#~ msgstr "Check the server host name is correct and is available."
+#: ../src/empathy-call-window.c:2932
+msgid "Mute"
+msgstr "Mute"
 
-#~ msgid "Gossip will now try to use your account:"
-#~ msgstr "Gossip will now try to use your account:"
+#: ../src/empathy-call-window.c:2934
+msgid "Duration"
+msgstr "Duration"
 
-#~ msgid "Gossip will now try to register the account:"
-#~ msgstr "Gossip will now try to register the account:"
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2937
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#~ msgid "Cus_tomize"
-#~ msgstr "Cus_tomize"
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
 
-#~ msgid "Edit or Delete this favorite."
-#~ msgstr "Edit or Delete this favourite."
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Sorry, you don’t have enough credit for that call."
 
-#~ msgid "Gossip - Join Chat Room "
-#~ msgstr "Gossip - Join Chat Room "
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr "Top Up"
 
-#~ msgid "Choose a Server"
-#~ msgstr "Choose a Server"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Match case"
 
-#~ msgid "On what server do you have an account?"
-#~ msgstr "On what server do you have an account?"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adding new account"
diff --git a/po/en_GB.po b/po/en_GB.po
index 5da43e26e..6da0e7d11 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2006 Empathy's COPYRIGHT HOLDER
 # This file is distributed under the same licence as the empathy package.
 # David Lodge <dave@cirt.net>, 2007, 2009.
-# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011.
+# Bruce Cowan <bruce@bcowan.me.uk>, 2009, 2010, 2011, 2012.
 # Philip Withnall <philip@tecnocode.co.uk>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-16 14:46+0100\n"
-"PO-Revision-Date: 2011-10-16 14:47+0100\n"
+"POT-Creation-Date: 2012-03-09 13:39+0000\n"
+"PO-Revision-Date: 2012-03-09 13:43+0100\n"
 "Last-Translator: Bruce Cowan <bruce@bcowan.me.uk>\n"
 "Language-Team: British English <en@li.org>\n"
 "Language: en_GB\n"
@@ -17,506 +17,558 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.1-rc1\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM Client"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy Internet Messaging"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM Client"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chat on Google Talk, Facebook, MSN and many other chat services"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Messaging and VoIP Accounts"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Manage Messaging and VoIP accounts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Always open a separate chat window for new chats."
+msgid "Connection managers should be used"
+msgstr "Connection managers should be used"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Call volume"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Call volume, as a percentage."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy should auto-connect on startup"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Camera device"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Whether Empathy should automatically log into your accounts on startup."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Camera position"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy should auto-away when idle"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Chat window theme"
+msgid "Empathy default download folder"
+msgstr "Empathy default download folder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Chat window theme variant"
+msgid "The default folder to save file transfers in."
+msgstr "The default folder to save file transfers in."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magic number used to check if sanity cleaning tasks should be run"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Compact contact list"
+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."
+msgstr ""
+"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."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Connection managers should be used"
+msgid "Show offline contacts"
+msgstr "Show offline contacts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Contact list sort criterion"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Whether to show contacts that are offline in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Default camera device to use in video calls, e.g. /dev/video0."
+msgid "Show avatars"
+msgstr "Show avatars"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Default directory to select an avatar image from"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Whether to show avatars for contacts in the contact list and chat windows."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Disable popup notifications when away"
+msgid "Show protocols"
+msgstr "Show protocols"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Disable sounds when away"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Whether to show protocols for contacts in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Display incoming events in the status area"
+msgid "Show Balance in contact list"
+msgstr "Show Balance in contact list"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
+msgid "Whether to show account balances in the contact list."
+msgstr "Whether to show account balances in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Echo cancellation support"
+msgid "Compact contact list"
+msgstr "Compact contact list"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy can publish the user's location"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Whether to show the contact list in compact mode."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy can use the GPS to guess the location"
+msgid "Hide main window"
+msgstr "Hide main window"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy can use the mobile phone network to guess the location"
+msgid "Hide the main window."
+msgstr "Hide the main window."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy can use the network to guess the location"
+msgid "Default directory to select an avatar image from"
+msgstr "Default directory to select an avatar image from"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy default download folder"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "The last directory that an avatar image was chosen from."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy has migrated butterfly logs"
+msgid "Open new chats in separate windows"
+msgstr "Open new chats in separate windows"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy should auto-away when idle"
+msgid "Always open a separate chat window for new chats."
+msgstr "Always open a separate chat window for new chats."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy should auto-connect on startup"
+msgid "Display incoming events in the status area"
+msgstr "Display incoming events in the status area"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy should reduce the location's accuracy"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy should use the avatar of the contact as the chat window icon"
+msgid "The position for the chat window side pane"
+msgstr "The position for the chat window side pane"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Enable WebKit Developer Tools"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "The stored position (in pixels) of the chat window side pane."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Enable popup notifications for new messages"
+msgid "Show contact groups"
+msgstr "Show contact groups"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Enable spell checker"
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Hide main window"
+msgid "Contact list sort criterion"
+msgstr "Contact list sort criterion"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Hide the main window."
+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 ""
+"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."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Nick completed character"
+msgid "Use notification sounds"
+msgstr "Use notification sounds"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Open new chats in separate windows"
+msgid "Whether to play a sound to notify of events."
+msgstr "Whether to play a sound to notify of events."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Path of the Adium theme to use"
+msgid "Disable sounds when away"
+msgstr "Disable sounds when away"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Whether to play sound notifications when away or busy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Play a sound for new conversations"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Whether to play a sound to notify of incoming messages."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Play a sound when a contact logs in"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Whether to play a sound to notify of outgoing messages."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Play a sound when a contact logs out"
+msgid "Play a sound for new conversations"
+msgstr "Play a sound for new conversations"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Play a sound when we log in"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Whether to play a sound to notify of new conversations."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Play a sound when we log out"
+msgid "Play a sound when a contact logs in"
+msgstr "Play a sound when a contact logs in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Pop up notifications if the chat isn't focused"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging into the network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Pop up notifications when a contact logs in"
+msgid "Play a sound when a contact logs out"
+msgstr "Play a sound when a contact logs out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Pop up notifications when a contact logs out"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Whether to play a sound to notify of contacts logging out of the network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Position the camera preview should be during a call."
+msgid "Play a sound when we log in"
+msgstr "Play a sound when we log in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Show Balance in contact list"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Whether to play a sound when logging into a network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Show avatars"
+msgid "Play a sound when we log out"
+msgstr "Play a sound when we log out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Show contact list in rooms"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Whether to play a sound when logging out of a network."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Show hint about closing the main window"
+msgid "Enable popup notifications for new messages"
+msgstr "Enable popup notifications for new messages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Show offline contacts"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Whether to show a popup notification when receiving a new message."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Show protocols"
+msgid "Disable popup notifications when away"
+msgstr "Disable popup notifications when away"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Spell checking languages"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Whether to show popup notifications when away or busy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "The default folder to save file transfers in."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pop up notifications if the chat isn't focused"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "The last directory that an avatar image was chosen from."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "The position for the chat window side pane"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pop up notifications when a contact logs in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "The stored position (in pixels) of the chat window side pane."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Whether to show a popup notification when a contact goes online."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "The theme that is used to display the conversation in chat windows."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pop up notifications when a contact logs out"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"The theme variant that is used to display the conversation in chat windows."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Whether to show a popup notification when a contact goes offline."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Use notification sounds"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Whether to convert smileys into graphical images in conversations."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Use theme for chat rooms"
+msgid "Show contact list in rooms"
+msgstr "Show contact list in rooms"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Whether Empathy can publish the user's location to their contacts."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Whether to show the contact list in chat rooms."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Whether Empathy can use the GPS to guess the location."
+msgid "Chat window theme"
+msgstr "Chat window theme"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Whether Empathy can use the mobile phone network to guess the location."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "The theme that is used to display the conversation in chat windows."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Whether Empathy can use the network to guess the location."
+msgid "Chat window theme variant"
+msgstr "Chat window theme variant"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Whether Empathy has migrated butterfly logs."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"The theme variant that is used to display the conversation in chat windows."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Whether Empathy should automatically log into your accounts on startup."
+msgid "Path of the Adium theme to use"
+msgstr "Path of the Adium theme to use"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgid "Enable WebKit Developer Tools"
+msgstr "Enable WebKit Developer Tools"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Whether to check words typed against the languages you want to check with."
+msgid "Use theme for chat rooms"
+msgstr "Use theme for chat rooms"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Whether to convert smileys into graphical images in conversations."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Whether to use the theme for chat rooms."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Whether to enable Pulseaudio's echo cancellation filter."
+msgid "Spell checking languages"
+msgstr "Spell checking languages"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Whether to play a sound to notify of contacts logging into the network."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Enable spell checker"
+msgstr "Enable spell checker"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Whether to play a sound to notify of events."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Whether to check words typed against the languages you want to check with."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Whether to play a sound to notify of incoming messages."
+msgid "Nick completed character"
+msgstr "Nick completed character"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Whether to play a sound to notify of new conversations."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Whether to play a sound to notify of outgoing messages."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy should use the avatar of the contact as the chat window icon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Whether to play a sound when logging into a network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Whether to play a sound when logging out of a network."
+msgid "Last account selected in Join Room dialog"
+msgstr "Last account selected in Join Room dialogue"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Whether to play sound notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "D-Bus object path of the last account selected to join a room."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Whether to show a popup notification when a contact goes offline."
+msgid "Camera device"
+msgstr "Camera device"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Default camera device to use in video calls, e.g. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+msgid "Camera position"
+msgstr "Camera position"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Whether to show a popup notification when receiving a new message."
+msgid "Position the camera preview should be during a call."
+msgstr "Position the camera preview should be during a call."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Whether to show account balances in the contact list."
+msgid "Echo cancellation support"
+msgstr "Echo cancellation support"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Whether to show contacts that are offline in the contact list."
+msgid "Show hint about closing the main window"
+msgstr "Show hint about closing the main window"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Whether to show the message dialogue about closing the main window with the "
+"'x' button in the title bar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Whether to show protocols for contacts in the contact list."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy can publish the user's location"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Whether to show the contact list in chat rooms."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Whether Empathy can publish the user's location to their contacts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Whether to show the contact list in compact mode."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy can use the network to guess the location"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Whether to show the message dialogue about closing the main window with the "
-"'x' button in the title bar."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Whether Empathy can use the network to guess the location."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Whether to use the theme for chat rooms."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy can use the mobile phone network to guess the location"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Whether Empathy can use the mobile phone network to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy can use the GPS to guess the location"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Whether Empathy can use the GPS to guess the location."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy should reduce the location's accuracy"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Manage Messaging and VoIP accounts"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "No reason was specified"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Messaging and VoIP Accounts"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "The change in state was requested"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "You cancelled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "The other participant cancelled the file transfer"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Error while trying to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "The other participant is unable to transfer the file"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Unknown reason"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "File transfer completed, but the file was corrupted"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "File transfer not supported by remote contact"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "The selected file is not a regular file"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "The selected file is empty"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Missed call from %s"
@@ -532,170 +584,139 @@ msgstr "Called %s"
 msgid "Call from %s"
 msgstr "Call from %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Socket type not supported"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "No reason was specified"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "The change in state was requested"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "You cancelled the file transfer"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "The other participant cancelled the file transfer"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Error while trying to transfer the file"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "The other participant is unable to transfer the file"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Available"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Busy"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Away"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "No reason specified"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status is set to offline"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Network error"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Authentication failed"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Encryption error"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Name in use"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certificate not provided"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificate untrusted"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certificate expired"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certificate not activated"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certificate hostname mismatch"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificate fingerprint mismatch"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificate self-signed"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certificate error"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Encryption is not available"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certificate is invalid"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Connection has been refused"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Connection can't be established"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Connection has been lost"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "This resource is already connected to the server"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "This account is already connected to the server"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Connection has been replaced by a new connection using the same resource"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "The account already exists on the server"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server is currently too busy to handle the connection"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certificate has been revoked"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certificate uses an insecure cypher algorithm or is cryptographically weak"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -703,283 +724,262 @@ msgstr ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Your software is too old"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internal error"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d second ago"
 msgstr[1] "%d seconds ago"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minute ago"
 msgstr[1] "%d minutes ago"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hour ago"
 msgstr[1] "%d hours ago"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d day ago"
 msgstr[1] "%d days ago"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d week ago"
 msgstr[1] "%d weeks ago"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d month ago"
 msgstr[1] "%d months ago"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "in the future"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "All accounts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "My Web Accounts"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "The account %s is edited via %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "The account %s cannot be edited in Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Launch My Web Accounts"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Edit %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Username:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_pply"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_og in"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "This account already exists on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Create a new account on the server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "Ca_ncel"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s on %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:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "New account"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Example:</b> MyScreenName"
+#: ../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:"
+msgstr "Pass_word:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Advanced"
+msgid "Screen _Name:"
+msgstr "Screen _Name:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Example:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pass_word:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Remember password"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Remember Password"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Remember password"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Screen _Name:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "What is your AIM password?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Advanced"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "What is your AIM screen name?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "What is your AIM password?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Example:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Remember Password"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Login I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Example:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "What is your GroupWise User ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "What is your GroupWise password?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Example:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Ch_aracter set:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "What is your ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "What is your ICQ password?"
 
@@ -1016,11 +1016,23 @@ msgstr "Options"
 msgid "None"
 msgstr "None"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Network"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Network:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Character set:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servers"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1028,14 +1040,6 @@ msgstr ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Network"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Network:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nickname:"
@@ -1052,48 +1056,20 @@ msgstr "Quit message:"
 msgid "Real name:"
 msgstr "Real name:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servers"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "What is your IRC nickname?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Which IRC network?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Example:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Example:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Encr_yption required (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnore SSL certificate errors"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Override server settings"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_ty:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "What is your IRC nickname?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Reso_urce:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "What is your Facebook username?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1105,179 +1081,203 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
 "Facebook username if you don't have one."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Use old SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "What is your Facebook password?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "What is your Facebook username?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "What is your Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Example:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "What is your Google password?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Example:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnore SSL certificate errors"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_ty:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Reso_urce:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Encr_yption required (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Use old SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Override server settings"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "What is your Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "What is your Jabber password?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "What is your desired Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "What is your Jabber password?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "What is your desired Jabber password?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Example:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "What is your Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "What is your Windows Live password?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_mail address:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Nic_kname:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Last Name:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_First Name:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Published Name:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Last Name:"
+msgid "E-_mail address:"
+msgstr "E-_mail address:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Username:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Example:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Authentication username:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Discover Binding"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Discover the STUN server automatically"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Use this account to call _landlines and mobile phones"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignore TLS Errors"
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Interval (seconds)"
+msgid "Proxy Options"
+msgstr "Proxy Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive Options"
+msgid "Miscellaneous Options"
+msgstr "Miscellaneous Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Loose Routeing"
+msgid "STUN Server:"
+msgstr "STUN Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanism:"
+msgid "Discover the STUN server automatically"
+msgstr "Discover the STUN server automatically"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Miscellaneous Options"
+msgid "Discover Binding"
+msgstr "Discover Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT Traversal Options"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive Options"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanism:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxy Options"
+msgid "Interval (seconds)"
+msgstr "Interval (seconds)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Authentication username:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN Server:"
+msgid "Loose Routing"
+msgstr "Loose Routeing"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Ignore TLS Errors"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Use this account to call _landlines and mobile phones"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "What is your SIP account password?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "What is your SIP login ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Username:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "What is your SIP account password?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnore conference and chat room invitations"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Room List locale:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "What is your Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "What is your Yahoo! password?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Room List locale:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1315,61 +1315,65 @@ msgstr "All Files"
 msgid "Click to enlarge"
 msgstr "Click to enlarge"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "There was an error starting the call"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "The specified contact doesn't support calls"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "The specified contact is offline"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "The specified contact is not valid"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Emergency calls are not supported on this protocol"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "You don't have enough credit in order to place this call"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Failed to open private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Topic not supported on this conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "You are not allowed to change the topic"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” is not a valid contact ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: clear all messages from the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: set the topic of the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: join a new chat room"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1377,23 +1381,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: open a private chat"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: change your nickname on the current server"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: send an ACTION message to the current conversation"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1403,11 +1407,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1415,113 +1419,126 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Usage: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Unknown command"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Unknown command; see /help for the available commands"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "insufficient balance to send message"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Error sending message '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Error sending message: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "insufficient balance to send message. <a href='%s'>Top up</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "not capable"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "invalid contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permission denied"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "too long message"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "not implemented"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "unknown"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Error sending message '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Error sending message: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Topic set to: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Topic set by %s to: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "No topic defined"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(No Suggestions)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Add '%s' to Dictionary"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Add '%s' to %s Dictionary"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Insert Smiley"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Spelling Suggestions"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Failed to retrieve recent logs"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s has disconnected"
@@ -1529,12 +1546,12 @@ msgstr "%s has disconnected"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s was kicked by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s was kicked"
@@ -1542,17 +1559,17 @@ msgstr "%s was kicked"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s was banned by %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s was banned"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s has left the room"
@@ -1562,17 +1579,17 @@ msgstr "%s has left the room"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s has joined the room"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s is now known as %s"
@@ -1580,90 +1597,90 @@ msgstr "%s is now known as %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:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Would you like to store this password?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Remember"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Not now"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Retry"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Wrong password; please try again:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "This room is protected by a password:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Join"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Connected"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversation"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Unknown or invalid identifier"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Contact blocking temporarily unavailable"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Contact blocking unavailable"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Permission Denied"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Could not block contact"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Edit Blocked Contacts"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Account:"
 
@@ -1673,463 +1690,368 @@ msgstr "Blocked Contacts"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Remove"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copy Link Address"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Open Link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Edit Contact Information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personal Information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "New Contact"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Block %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Are you sure you want to block '%s' from contacting you again?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Block"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Report this contact as abusive"
 msgstr[1] "_Report these contacts as abusive"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decide _Later"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Subscription Request"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Block User"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ungrouped"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Favourite People"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Do you really want to remove the group '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Removing group"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Remove"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Do you really want to remove the contact '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Removing contact"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Add Contact…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Block Contact"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Chat"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio Call"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video Call"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Previous Conversations"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Send File"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Share My Desktop"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favourite"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mation"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Edit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Inviting you to this room"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Invite to Chat Room"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decide _Later"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Search contacts"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Search: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Add Contact"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "No contacts found"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Your message introducing yourself:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Please let me see when you're online. Thanks!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Select a contact"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Full name:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Phone number:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail address:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Website:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Birthday:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Last seen:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Connected from:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Away message:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Channels:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Country ISO Code:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Country:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "County:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "City:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postal Code:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Street:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Building:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Floor:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Room:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Text:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Description:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Accuracy Level:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Error:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertical Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontal Error (metres):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Bearing:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Climb Speed:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Last Updated on:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Location"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Save Avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Unable to save avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Location</b> at (date)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Client Information"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Client:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personal Details"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Contact Details"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Full name"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Phone number"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-mail address"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Website"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Birthday"
+
+#. 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 "Last seen:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connected from:"
+
+#. 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 "Away message:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "work"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "home"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobile"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voice"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferred"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifier:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Location</b> at (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Information requested…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Client Information"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Version:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Client:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Groups"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2137,105 +2059,170 @@ msgstr ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Add Group"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Select"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Group"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "The following identity will be blocked:"
 msgstr[1] "The following identities will be blocked:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "The following identity can not be blocked:"
 msgstr[1] "The following identities can not be blocked:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Linked Contacts"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Select contacts to link"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "New contact preview"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Contacts selected in the list on the left will be linked together."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Edit Contact Information"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Select account to use to place the call"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Call"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobile"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Work"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HOME"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Block Contact"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Chat"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video Call"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Previous Conversations"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Send File"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Share My Desktop"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favourite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts not installed"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Please install gnome-contacts to access contacts details."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mation"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Edit"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Link Contacts…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Inviting you to this room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Invite to Chat Room"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Add Contact…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Delete and _Block"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Do you really want to remove the group '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Removing group"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Remove"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Do you really want to remove the contact '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2244,7 +2231,11 @@ msgstr ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Removing contact"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2255,23 +2246,23 @@ msgstr[1] "Linked contacts containing %u contacts"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Location</b> at (date)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Online from a phone or mobile device"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "New Network"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Choose an IRC network"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Reset _Networks List"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Select"
@@ -2284,249 +2275,251 @@ msgstr "new server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Link Contacts"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Unlink…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Completely split the displayed linked contacts into the separate contacts."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Link"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Unlink linked contacts '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Unlink"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "History"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Show"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Search"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Chat in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat with %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s second"
 msgstr[1] "%s seconds"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minute"
 msgstr[1] "%s minutes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Call took %s, ended at %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Today"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Yesterday"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Anytime"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Anyone"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Who"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "When"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Anything"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Text chats"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Incoming calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Outgoing calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Missed calls"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "What"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Are you sure you want to delete all logs of previous conversations?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Clear All"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Delete from:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Loading…</span>"
+msgid "_File"
+msgstr "_File"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../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 "_Edit"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Delete All History…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profile"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Edit"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_File"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "page 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Contact ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Loading…</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "The contact is offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "C_hat"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "The specified contact is either invalid or unknown"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "The contact does not support this kind of conversation"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "The requested functionality is not implemented for this protocol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Could not start a conversation with the given contact"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "You are banned from this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "This channel is full"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "You must be invited to join this channel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Can't proceed while disconnected"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "There was an error starting the conversation"
+
+#: ../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 "Enter a contact identifier or phone number:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "New Conversation"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Send _Video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video Call"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "C_all"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio Call"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "New Call"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Authentication failed for account <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"
@@ -2563,12 +2556,8 @@ msgstr "Click to make this status a favourite"
 msgid "Set status"
 msgstr "Set status"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Set your presence and current status"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Custom messages…"
 
@@ -2576,7 +2565,7 @@ msgstr "Custom messages…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "New %s account"
@@ -2586,20 +2575,20 @@ msgid "Find:"
 msgstr "Find:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Mat_ch case"
+msgid "_Previous"
+msgstr "_Previous"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Phrase not found"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Next"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_ch case"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Previous"
+msgid "Phrase not found"
+msgstr "Phrase not found"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2645,12 +2634,12 @@ msgstr "Voice call ended"
 msgid "Edit Custom Messages"
 msgstr "Edit Custom Messages"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Message edited at %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2728,34 +2717,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certificate hostname: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continue"
+msgid "C_ontinue"
+msgstr "C_ontinue"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Untrusted connection"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "This connection is untrusted. Would you like to continue anyway?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Remember this choice for future connections"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certificate Details"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Unable to open URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Select a file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Insufficient free space to save file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2764,7 +2757,7 @@ msgstr ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Incoming file from %s"
@@ -2936,39 +2929,31 @@ msgstr "Western"
 msgid "Vietnamese"
 msgstr "Vietnamese"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "The selected contact cannot receive files."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "The selected contact is offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "No error message"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Instant Message (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Don't connect on startup"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Don't display the contact list or any other dialogues on startup"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM Client"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Error contacting the Account Manager"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3015,233 +3000,94 @@ msgstr ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "An Instant Messaging client for GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "David Lodge <dave@cirt.net>\n"
 "Philip Withnall <philip@tecnocode.co.uk>\n"
 "Bruce Cowan <bruce@bcowan.me.uk>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "There was an error while importing the accounts."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "There was an error while parsing the account details."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "There was an error while creating the account."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "There was an error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "The error message was: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "An error occurred"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "What kind of chat account do you have?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Do you have any other chat accounts you want to set up?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Enter your account details"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "What kind of chat account do you want to create?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Do you want to create other chat accounts?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Enter the details for the new account"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Do you have an account you've been using with another chat program?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Yes, import my account details from "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Yes, I'll enter my account details now"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "No, I want a new account"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, I just want to see people online nearby for now"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Select the accounts you want to import:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Yes"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "No, that's all for now"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"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' dialogue"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Edit->Accounts"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "I do _not want to enable this feature for now"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialogue"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut not installed"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Messaging and VoIP Accounts Assistant"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Welcome to Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Import your existing accounts"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Please enter personal details"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "There are unsaved modifications to your %s account."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Your new account has not been saved yet."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Connecting…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnected — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Offline — No Network Connection"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Unknown Status"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Offline — Account Disabled"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Edit Connection Parameters"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Failed to retrieve your personal information from the server."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Go online to edit your personal information."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Edit Connection Parameters…"
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Do you want to remove %s from your computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "This will not remove your account on the server."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,15 +3096,23 @@ msgstr ""
 "your changes. Are you sure you want to proceed?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Disable"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Skip"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Connect"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3270,19 +3124,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Add…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Loading account information"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "No protocol installed"
+msgid "_Import…"
+msgstr "_Import…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocol:"
+msgid "Loading account information"
+msgstr "Loading account information"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3290,132 +3140,116 @@ msgstr ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Import…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "No protocol backends installed"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Empathy authentication client"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy authentication client"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "People nearby"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy Audio/Video Client"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy Audio/Video Client"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brightness"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Sidebar"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Audio input"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video input"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Dialpad"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Details"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Call with %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "The IP address as seen by the machine"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "The IP address as seen by a server on the Internet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "The IP address of the peer as seen by the other side"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "The IP address of a relay server"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "The IP address of the multicast group"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Unknown"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Unknown"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Unknown"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connected — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Technical Details"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3424,8 +3258,8 @@ msgstr ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3434,8 +3268,8 @@ msgstr ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3444,27 +3278,27 @@ msgstr ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "There was a failure on the network"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "The audio formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "The video formats necessary for this call are not installed on your computer"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3475,262 +3309,311 @@ msgstr ""
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "There was a failure in the call engine"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "The end of the stream was reached"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Can't establish audio stream"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Can't establish video stream"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Call"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Decoding Codec:"
+msgid "_Microphone"
+msgstr "_Microphone"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Disable camera"
+msgid "_Camera"
+msgstr "_Camera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Display the dialpad"
+msgid "_Settings"
+msgstr "_Settings"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Encoding Codec:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_View"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Hang up"
+#: ../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 "_Help"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Hang up current call"
+#: ../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 "_Contents"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Local Candidate:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debug"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximise me"
+msgid "Swap camera"
+msgstr "Swap camera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimise me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Remote Candidate:"
+msgid "Maximise me"
+msgstr "Maximise me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Send Audio"
+msgid "Disable camera"
+msgstr "Disable camera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Send Video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Hang up"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Show dialpad"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Hang up current call"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video call"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Start a video call"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Start an audio call"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Swap camera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Toggle audio transmission"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Toggle video transmission"
+msgid "Show dialpad"
+msgstr "Show dialpad"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Unknown"
+msgid "Display the dialpad"
+msgstr "Display the dialpad"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Send Video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video call"
+msgid "Toggle video transmission"
+msgstr "Toggle video transmission"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Call"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Send Audio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Camera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Contents"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Toggle audio transmission"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Debug"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Encoding Codec:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Help"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Unknown"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Decoding Codec:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Microphone"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Remote Candidate:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Settings"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Local Candidate:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_View"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Close this window?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgstr[1] ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Leave %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Close window"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Leave room"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d unread)"
 msgstr[1] "%s (%d unread)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (and %u other)"
 msgstr[1] "%s (and %u others)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d unread from others)"
 msgstr[1] "%s (%d unread from others)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d unread from all)"
 msgstr[1] "%s (%d unread from all)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sending %d message"
 msgstr[1] "Sending %d messages"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Typing a message."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "C_lear"
+msgid "_Conversation"
+msgstr "_Conversation"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontact"
+msgid "C_lear"
+msgstr "C_lear"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Insert _Smiley"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favourite Chat Room"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invite _Participant…"
+msgid "Notify for All Messages"
+msgstr "Notify for All Messages"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Move Tab _Left"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Show Contact List"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Move Tab _Right"
+msgid "Invite _Participant…"
+msgstr "Invite _Participant…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notify for All Messages"
+msgid "C_ontact"
+msgstr "C_ontact"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversation"
+msgid "_Tabs"
+msgstr "_Tabs"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Detach Tab"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favourite Chat Room"
+msgid "_Previous Tab"
+msgstr "_Previous Tab"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Next Tab"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Previous Tab"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Undo Close Tab"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Show Contact List"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Move Tab _Left"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Tabs"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Move Tab _Right"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Undo Close Tab"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Detach Tab"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3744,100 +3627,100 @@ msgstr "Room"
 msgid "Auto-Connect"
 msgstr "Auto-Connect"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Manage Favourite Rooms"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Incoming video call"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Incoming call"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s is video calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s is calling you. Do you want to answer?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Incoming call from %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Reject"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Answer"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Answer with video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Incoming video call from %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Room invitation"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitation to join %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s is inviting you to join %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Decline"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Join"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invited you to join %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "You have been invited to join %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Incoming file transfer from %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Password required"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s would like permission to see when you are online"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3847,105 +3730,105 @@ msgstr ""
 "Message: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s of %s at %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s of %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Receiving \"%s\" from %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sending \"%s\" to %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Error receiving \"%s\" from %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Error receiving a file"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Error sending \"%s\" to %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Error sending a file"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" received from %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" sent to %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Waiting for the other participant's response"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Checking integrity of \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hashing \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Remaining"
 
@@ -3957,7 +3840,11 @@ msgstr "File Transfers"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Remove completed, cancelled and failed file transfers from the list"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Import"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3965,171 +3852,195 @@ msgstr ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Import Accounts"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Source"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Provide Password"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "You need to setup an account to see contacts here."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "No match found"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Sorry, %s accounts can’t be used until your %s software is updated."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Update software…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Close"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconnect"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Edit Account"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Close"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Top up %s (%s)…"
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Top up account credit"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Top Up…"
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contact"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "You need to enable one of your accounts to see contacts here."
+
+#. 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 "You need to enable %s to see contacts here."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Contact List"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contacts on a _Map"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Account settings"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Credit Balance"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_New Conversation…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Find in Contact _List"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "New _Call…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Join _Favourites"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Search for Contacts…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Manage Favourites"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_File Transfers"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal Size"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Offline Contacts"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "New _Call…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Show P_rotocols"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal Size With _Avatars"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Credit Balance"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contacts on a _Map"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Accounts"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blocked Contacts"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_references"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Show P_rotocols"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Find in Contact _List"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Sort by _Name"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Sort by _Status"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Accounts"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal Size With _Avatars"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blocked Contacts"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormal Size"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Compact Size"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_File Transfers"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Room"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Join…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_New Conversation…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Offline Contacts"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personal Information"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Room"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Join _Favourites"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Search for Contacts…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Manage Favourites"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Chat Room"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Members"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4142,22 +4053,27 @@ msgstr ""
 "Password required: %s\n"
 "Members: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Yes"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Could not start room listing"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Could not stop room listing"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Couldn't load room list"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Join Room"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4166,6 +4082,10 @@ msgstr ""
 "Enter the room name to join here or click on one or more rooms in the list."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Room:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4173,378 +4093,395 @@ msgstr ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Join Room"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Couldn't load room list"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Room List"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Room:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Message received"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Message sent"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "New conversation"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Contact comes online"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Contact goes offline"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Account connected"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Account disconnected"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Language"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Juliet has disconnected"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferences"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Show _smileys as images"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Show contact _list in rooms"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Behaviour"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Start chats in:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Chat Th_eme:"
+msgid "new ta_bs"
+msgstr "new ta_bs"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Disable notifications when _away or busy"
+msgid "new _windows"
+msgstr "new _windows"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Disable sounds when _away or busy"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Display incoming events in the notification area"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automatically connect on startup"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
+msgid "Log conversations"
+msgstr "Log conversations"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Enable notifications when a contact comes online"
+msgid "Behavior"
+msgstr "Behaviour"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Enable notifications when a contact goes offline"
+msgid "General"
+msgstr "General"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Enable notifications when the _chat is not focused"
+msgid "_Enable bubble notifications"
+msgstr "_Enable bubble notifications"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Enable spell checking for languages:"
+msgid "Disable notifications when _away or busy"
+msgstr "Disable notifications when _away or busy"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "General"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enable notifications when the _chat is not focused"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Input level:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Enable notifications when a contact comes online"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Input volume:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enable notifications when a contact goes offline"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notifications"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Location sources:"
+msgid "_Enable sound notifications"
+msgstr "_Enable sound notifications"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Log conversations"
+msgid "Disable sounds when _away or busy"
+msgstr "Disable sounds when _away or busy"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notifications"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Play sound for events"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sounds"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privacy"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Use _echo cancellation to improve call quality"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"county and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Show _smileys as images"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Show contact _list in rooms"
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sounds"
+msgid "_Publish location to my contacts"
+msgstr "_Publish location to my contacts"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Spell Checking"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"county and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 
+#. 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 "Themes"
-msgstr "Themes"
+msgid "_Reduce location accuracy"
+msgstr "_Reduce location accuracy"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Use _echo cancellation to improve call quality"
+msgid "Privacy"
+msgstr "Privacy"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Variant:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "_Automatically connect on startup"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Mobile phone"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "_Enable bubble notifications"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Network (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "_Enable sound notifications"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Location sources:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Network (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Enable spell checking for languages:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Open new chats in separate windows"
+msgid "Spell Checking"
+msgstr "Spell Checking"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publish location to my contacts"
+msgid "Chat Th_eme:"
+msgstr "Chat Th_eme:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
 
-#. 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:41
-msgid "_Reduce location accuracy"
-msgstr "_Reduce location accuracy"
+msgid "Themes"
+msgstr "Themes"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Call the contact again"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Camera Off"
+msgid "Redial"
+msgstr "Redial"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Camera On"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video Off"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Disable camera and stop sending video"
+msgid "Video Preview"
+msgstr "Video Preview"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Enable camera and send video"
+msgid "Video On"
+msgstr "Video On"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Enable camera but don't send video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Call the contact again"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Preview"
+msgid "Camera Off"
+msgstr "Camera Off"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Redial"
+msgid "Disable camera and stop sending video"
+msgstr "Disable camera and stop sending video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Preview"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video Off"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enable camera but don't send video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video On"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Camera On"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video Preview"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enable camera and send video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Save"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin link"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin response"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Data too large for a single paste. Please save logs to file."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Debug Window"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Send to pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Level "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Message"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Warning"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Critical"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Time"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domain"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Category"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Level"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4552,131 +4489,428 @@ msgstr ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Invite Participant"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Choose a contact to invite into the conversation:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Invite"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Don't display any dialogues; do any work (eg, importing) and exit"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Don't display any dialogues unless there are only \"People Nearby\" accounts"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy Accounts"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy Accounts"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Show a particular service"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy Debugger"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy Debugger"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy Chat Client"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Respond"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Reject"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Answer"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Answer with video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Decline"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Accept"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Provide"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s just tried to call you, but you were in another call."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "On hold"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Mute"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duration"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Your current balance is %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Sorry, you don’t have enough credit for that call."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Top Up"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Match case"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "What kind of chat account do you have?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adding new account"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "People nearby"
+
+#: ../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."
+msgstr ""
+"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."
+
+#: ../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 ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+
+#~ msgid "Call volume"
+#~ msgstr "Call volume"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Call volume, as a percentage."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy has migrated butterfly logs"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Whether Empathy has migrated butterfly logs."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket type not supported"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "My Web Accounts"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "The account %s is edited via %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "The account %s cannot be edited in Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Launch My Web Accounts"
+
+#~ msgid "Edit %s"
+#~ msgstr "Edit %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Ca_ncel"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personal Information"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Ungrouped"
+
+#~ msgid "Favorite People"
+#~ msgstr "Favourite People"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Edit"
+
+#~ msgid "Select a contact"
+#~ msgstr "Select a contact"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Linked Contacts"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Select contacts to link"
+
+#~ msgid "New contact preview"
+#~ msgstr "New contact preview"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Contacts selected in the list on the left will be linked together."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Link Contacts…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Link Contacts"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Unlink…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+
+#~ msgid "_Link"
+#~ msgstr "_Link"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Unlink linked contacts '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Unlink"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Contact ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "C_hat"
+
+#~ msgid "Send _Video"
+#~ msgstr "Send _Video"
+
+#~ msgid "C_all"
+#~ msgstr "C_all"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Set your presence and current status"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "The selected contact cannot receive files."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "The selected contact is offline."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "There was an error while importing the accounts."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "There was an error while parsing the account details."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "There was an error while creating the account."
+
+#~ msgid "There was an error."
+#~ msgstr "There was an error."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "The error message was: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+
+#~ msgid "An error occurred"
+#~ msgstr "An error occurred"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Do you have any other chat accounts you want to set up?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Enter your account details"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "What kind of chat account do you want to create?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Do you want to create other chat accounts?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Enter the details for the new account"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Do you have an account you've been using with another chat program?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Yes, import my account details from "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Yes, I'll enter my account details now"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, I want a new account"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, I just want to see people online nearby for now"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Select the accounts you want to import:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, that's all for now"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Edit->Accounts"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "I do _not want to enable this feature for now"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialogue"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Messaging and VoIP Accounts Assistant"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Welcome to Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Import your existing accounts"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Please enter personal details"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocol:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Unknown"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personal Information"
+
+#~ msgid "Input level:"
+#~ msgstr "Input level:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Input volume:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Open new chats in separate windows"
+
 #~ msgid "All"
 #~ msgstr "All"
 
@@ -4851,9 +5085,6 @@ msgstr "_Match case"
 #~ msgid "Hidden"
 #~ msgstr "Hidden"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "User requested disconnect"
-
 #~ msgid "_Add Contact..."
 #~ msgstr "_Add Contact…"
 
@@ -5278,9 +5509,6 @@ msgstr "_Match case"
 #~ msgid "View previous conversations with this contact"
 #~ msgstr "View previous conversations with this contact"
 
-#~ msgid "Start a voice or video conversation with this contact"
-#~ msgstr "Start a voice or video conversation with this contact"
-
 #~ msgid "Invalid handle"
 #~ msgstr "Invalid handle"
 
@@ -5326,9 +5554,6 @@ msgstr "_Match case"
 #~ msgid "_Use for chat rooms"
 #~ msgstr "_Use for chat rooms"
 
-#~ msgid "ICQ account settings"
-#~ msgstr "ICQ account settings"
-
 #~ msgid "irc account settings"
 #~ msgstr "irc account settings"
 
diff --git a/po/eo.po b/po/eo.po
index 30ac8814a..6709d829a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,553 +1,573 @@
 # Esperanto translation for Empathy.
-# Copyright (C) 2004-2011 Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empathy package.
 #
 # Brient HESS <brient@brient.net>, 2004.
 # Aisano, Eliovir, ISHII Eiju, Javier Lancha, Kvantumo, Lucas LARSON, Michael MORONI, Petr Adam DOHNÁLEK, Robert BOGENSCHNEIDER, Serge LEBLANC, Shane D, Yamiharu.
 # Neil ROBERTS < >, 2011.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-04 18:19+0000\n"
-"PO-Revision-Date: 2011-10-09 07:59+0200\n"
+"POT-Creation-Date: 2012-03-10 22:08+0000\n"
+"PO-Revision-Date: 2012-03-11 11:26+0100\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <ubuntu-l10n-eo@lists.launchpad.net>\n"
+"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"X-Launchpad-Export-Date: 2012-03-10 23:48+0000\n"
+"X-Generator: Launchpad (build 14914)\n"
 "X-DamnedLies-Scope: partial\n"
-"X-Generator: Launchpad (build 13037)\n"
-"X-Launchpad-Export-Date: 2011-05-14 18:39+0000\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Retbabilo per Google Talk, Vizaĝlibro, MSN kaj multaj aliaj servoj"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empatio"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Tujmesaĝilo"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empatio ret-mesaĝado"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Tujmesaĝilo"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Retbabilo per Google Talk, Vizaĝlibro, MSN kaj multaj aliaj servoj"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Babilaj kaj VoIP-kontoj"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Administri babilaj kaj VoIP-kontojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Ĉiam malfermi apartan babil-fenestron por novaj babiladoj."
+msgid "Connection managers should be used"
+msgstr "Konekto-administrilo estu uzata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-#| msgid "Call from %s"
-msgid "Call volume"
-msgstr "Voko-laŭteco"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "Ĉu uzi konekteco-administoloj por aŭtomate malkonekti/rekonekti?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr ""
+msgid "Empathy should auto-connect on startup"
+msgstr "Aŭtomata konekto dum la startigo de Empatio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#| msgid "Camera On"
-msgid "Camera device"
-msgstr "Filmila aparato"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ĉu Empatio aŭtomate konektiĝu al via kontoj dum startigo?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#| msgid "Camera On"
-msgid "Camera position"
-msgstr "Filmila pazicio"
+msgid "Empathy should auto-away when idle"
+msgstr "Kaŝi Empation aŭtomate kiam senokupe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Signo uzenda post kromnomo dum uzado de plenumig-klavo (Tab) en grupbabilejo."
+"Ĉu Empatio aŭtomate ŝanĝo al forestanta reĝimo se la uzanto estas neokupite?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Babil-fenestra etoso"
+msgid "Empathy default download folder"
+msgstr "Defaŭlta elŝutujo de Empatio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Variaĵo de babil-fenestra etoso"
+msgid "The default folder to save file transfers in."
+msgstr "La defaŭlta dosierujo por konservi ricevitajn dosierojn."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Listo disigita per komoj, kun uzendaj lingvoj por la kontrolilo (ekz. \"eo, "
-"fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Kompakta listo de kontaktuloj"
+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."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Konekto-administrilo estu uzata"
+msgid "Show offline contacts"
+msgstr "Montri malkonektitulojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kontaktlista ordigkriterio"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ĉu montri nekonektatajn kontaktoj en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
+msgid "Show avatars"
+msgstr "Montri uzantobildojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Defaŭlta dosierujo por elekto de uzantobildo"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Ĉu montri uzantobildojn por kontaktoj en la kontaktaro kaj la "
+"babilejfenestroj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Elŝalti ŝprucfenestro-sciigojn dum foresto"
+msgid "Show protocols"
+msgstr "Montri protokolojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Malaktivigi sonon kiam fora"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ĉu montri protokolojn de kontaktoj en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Montri envenantajn eventojn en la statusa areo"
+msgid "Show Balance in contact list"
+msgstr "Montri bilancon en la kontaktaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Montri envenantajn eventojn en la statusa areo. Se negativa, prezenti ilin "
-"al la uzanto tuj."
+msgid "Whether to show account balances in the contact list."
+msgstr "Ĉu montri la konto-bilancon en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr ""
+msgid "Compact contact list"
+msgstr "Kompakta listo de kontaktuloj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empatio povas publikigi la lokon de la uzanto"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ĉu montri la kontaktaron en kompakta reĝimo?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
+msgid "Hide main window"
+msgstr "Kaŝi ĉeffenestron"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empatio rajtas uzi la reton de la portebla telefono por diveni la lokon"
+msgid "Hide the main window."
+msgstr "Kaŝi la ĉefan fenestron."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empatio rajtas uzi la reton por diveni la lokon"
+msgid "Default directory to select an avatar image from"
+msgstr "Defaŭlta dosierujo por elekto de uzantobildo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Defaŭlta elŝutujo de Empatio"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "La lasta dosierujo el kie estis elektita uzantobildon."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empatio translokis papiliajn spurojn"
+msgid "Open new chats in separate windows"
+msgstr "Malfermi novajn babilejojn en apartaj fenestroj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Kaŝi Empation aŭtomate kiam senokupe"
+msgid "Always open a separate chat window for new chats."
+msgstr "Ĉiam malfermi apartan babil-fenestron por novaj babiladoj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Aŭtomata konekto dum la startigo de Empatio"
+msgid "Display incoming events in the status area"
+msgstr "Montri envenantajn eventojn en la statusa areo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empatio devas redukti la precizon pri la loko"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Montri envenantajn eventojn en la statusa areo. Se negativa, prezenti ilin "
+"al la uzanto tuj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
-"babilo-fenestro"
+msgid "The position for the chat window side pane"
+msgstr "La loko por la flanka babilfenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Enŝalti evoluigantilojn de WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "La memorigita loko (en bilderoj) de la flanka panelo de la babilejo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Enŝalti ŝprucfenestro-sciigojn pri novaj mesaĝoj"
+msgid "Show contact groups"
+msgstr "Montri kontakt-grupojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Enŝalti literumadan kontrolilon"
+msgid "Whether to show groups in the contact list."
+msgstr "Ĉu montri grupojn en la kontaktaro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Kaŝi ĉeffenestron"
+msgid "Contact list sort criterion"
+msgstr "Kontaktlista ordigkriterio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Kaŝi la ĉefan fenestron."
+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 ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr ""
+msgid "Use notification sounds"
+msgstr "Uzi atentig-sonojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Malfermi novajn babilejojn en apartaj fenestroj"
+msgid "Whether to play a sound to notify of events."
+msgstr "Ĉu ludi sonon por sciigi pri eventoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Pado de la uzenda etoso por Adium"
+msgid "Disable sounds when away"
+msgstr "Malaktivigi sonon kiam fora"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Vojo de la uzenda etoso por Adium se la etoso de la babilejo estas Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ĉu ludi sonajn sciigojn kiam oni estas for aŭ okupiĝata?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Ludi sonon pro alvenintaj mesaĝoj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Ludi sonon pro novaj babiloj"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ĉu ludi sonon por averti pro alvenintaj mesaĝoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Ludi sonon pro elirantaj mesaĝoj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Ludi sonon kiam kontaktulo ensalutas"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ĉu ludi sonon por averti pro elirantaj mesaĝoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Ludi sonon kiam kontaktulo elsalutas"
+msgid "Play a sound for new conversations"
+msgstr "Ludi sonon pro novaj babiloj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Ludi sonon kiam ni ensalutas"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ĉu ludi sonon por averti pro novaj konversacioj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Ludi sonon kiam ni elsalutas"
+msgid "Play a sound when a contact logs in"
+msgstr "Ludi sonon kiam kontaktulo ensalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ŝprucfenestri sciigojn se la babilejo ne estas fokusite"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ĉu ludi sonon por sciigi pri kontaktoj kiuj ensalutas en reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ŝprucfenestri sciigojn kiam kontaktulo ensalutas"
+msgid "Play a sound when a contact logs out"
+msgstr "Ludi sonon kiam kontaktulo elsalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ŝprucfenestri sciigojn kiam kontaktulo elsalutas"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ĉu ludi sonon por sciigi pri kontaktoj kiuj elsalutas de reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Play a sound when we log in"
+msgstr "Ludi sonon kiam ni ensalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Show offline contacts"
-msgid "Show Balance in contact list"
-msgstr "Montri malkonektitulojn"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ĉu ludi sonon dum ensaluto en nova reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Montri avatarojn"
+msgid "Play a sound when we log out"
+msgstr "Ludi sonon kiam ni elsalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Montri kontakto-liston per ĉambroj"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ĉu ludi sonon dum elsaluto de reto?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
+msgid "Enable popup notifications for new messages"
+msgstr "Enŝalti ŝprucfenestrajn sciigojn pri novaj mesaĝoj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Montri malkonektitulojn"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Ĉu montri ŝprucfenestrajn sciigojn pri ricevo de novaj mesaĝoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Montri protokolojn"
+msgid "Disable popup notifications when away"
+msgstr "Elŝalti ŝprucfenestro-sciigojn dum foresto"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Literum-kontrolataj lingvoj"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Ĉu montri ŝprucfenestrajn sciigojn kiam oni estas for aŭ okupiĝatas?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "La defaŭlta dosierujo por konservi ricevitajn dosierojn."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ŝprucfenestri sciigojn se la babilejo ne estas fokusite"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "La lasta dosierujo el kie estis elektita avataron."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Ĉu montri ŝprucfenestrajn sciigojn kiam novaj mesaĝoj alvenas eĉ se la "
+"babilejo jam estas malfermita, sed ne havas la fokuson?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "La loko por la flanka babilfenestro"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ŝprucfenestri sciigojn kiam kontaktulo ensalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "La memorigita loko (en bilderoj) de la flanka panelo de la babilejo."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Ĉu montri ŝprucfenestrajn sciigojn kiam kontakto ekkonektas?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
-"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ŝprucfenestri sciigoj kiam kontaktulo elsalutas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"La variaĵo de etoso, kiu estas uzata por montri la babilon en la "
-"babilejfenestroj."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ĉu montri ŝprucfenestrajn sciigojn kiam kontakto malkonektas?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Uzi grafikajn mienetojn"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Uzi atentig-sonojn"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ĉu konverti miensimbolojn al grafikaj bildoj en konversacioj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Uzi etoson por la babilo-ĉambroj"
+msgid "Show contact list in rooms"
+msgstr "Montri kontakto-liston per ĉambroj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj?"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ĉu montri kontaktaron en babilejoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion?"
+msgid "Chat window theme"
+msgstr "Babil-fenestra etoso"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
+msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
-"Ĉu Empatio rajtas uzi la reton de la portebla telefono por diveni la "
-"pozicion?"
+"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion?"
+msgid "Chat window theme variant"
+msgstr "Variaĵo de babil-fenestra etoso"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-#, fuzzy
-#| msgid "Empathy has migrated butterfly logs"
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empatio translokis papiliajn spurojn"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"La variaĵo de etoso, kiu estas uzata por montri la babilon en la "
+"babilejfenestroj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ĉu Empatio aŭtomate konektiĝu al via kontoj dum startigo?"
+msgid "Path of the Adium theme to use"
+msgstr "Pado de la uzenda etoso por Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-#, fuzzy
-#| msgid ""
-#| "Whether Empathy should automatically log into your accounts on startup."
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ĉu Empatio aŭtomate konektiĝu al via kontoj dum startigo?"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Vojo de la uzenda etoso por Adium se la etoso de la babilejo estas Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ĉu Empatio reduktu la precizon de la loko pro privatec-kialoj?"
+msgid "Enable WebKit Developer Tools"
+msgstr "Enŝalti evoluigantilojn de WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-#, fuzzy
-#| msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
-"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
-"babilo-fenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
+msgid "Inform other users when you are typing to them"
+msgstr "Informi aliajn uzantojn kiam vi skribas al ili"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
+msgid "Use theme for chat rooms"
+msgstr "Uzi etoson por la babilo-ĉambroj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ĉu konverti miensimbolojn al grafikaj bildoj en konversacioj?"
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ĉu uzi la etoson por babilejoj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Spell checking languages"
+msgstr "Literum-kontrolataj lingvoj"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
+"Listo disigita per komoj, kun uzendaj lingvoj por la kontrolilo (ekz. \"eo, "
+"fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
+msgid "Enable spell checker"
+msgstr "Enŝalti literumadan kontrolilon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-#, fuzzy
-#| msgid "Play a sound for incoming messages"
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ludi sonon pro alvenintaj mesaĝoj"
+msgid "Nick completed character"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-#, fuzzy
-#| msgid "Play a sound for new conversations"
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ludi sonon pro novaj babiloj"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Signo uzenda post kromnomo dum uzado de plenumig-klavo (Tab) en grupbabilejo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-#, fuzzy
-#| msgid "Play a sound for outgoing messages"
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ludi sonon pro elirantaj mesaĝoj"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empatio devas uzi la uzantobildon de la kontaktulo kiel piktogramo de la "
+"babilo-fenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
+"Ĉu Empatio uzu la uzantobildon de la kontaktulo kiel piktogramo de la babilo-"
+"fenestro?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
+msgid "Last account selected in Join Room dialog"
 msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-#, fuzzy
-#| msgid "Disable notifications when _away or busy"
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Malŝalti sciigojn kiam oni foras aŭ okupiĝas"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-#, fuzzy
-#| msgid "Enable notifications when a contact goes offline"
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Ŝalti sciigojn kian kontakto malkonektas"
+msgid "Camera device"
+msgstr "Filmila aparato"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-#, fuzzy
-#| msgid "Enable notifications when a contact comes online"
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Ŝalti sciigojn kiam kontakto konektas"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Defaŭlta kamera-aparato por uzi dum video-vokoj, ekz. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
+msgid "Camera position"
+msgstr "Filmila pazicio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-#, fuzzy
-#| msgid "Enable popup notifications for new messages"
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Enŝalti ŝprucfenestro-sciigojn pri novaj mesaĝoj"
+msgid "Position the camera preview should be during a call."
+msgstr "Posicio de la kameraa antaŭrigardo dum voko."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
+msgid "Echo cancellation support"
+msgstr "Eĥo-nuligada supteno"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"La etoso, kiu estas uzata por montri la babilon en la babilejfenestroj."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ĉu enŝalti la eĥo-nuligadan filtrilon de Pulseaudio?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
+msgid "Show hint about closing the main window"
+msgstr "Montri konsileton pri fermado de la ĉefa fenestro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-#, fuzzy
-#| msgid "Disable notifications when _away or busy"
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Malŝalti sciigojn kiam oni foras aŭ okupiĝas"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
+msgid "Empathy can publish the user's location"
+msgstr "Empatio povas publikigi la lokon de la uzanto"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-#, fuzzy
-#| msgid "Whether to use the theme for chat rooms."
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ĉu uzi la etoson por babilejoj?"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Ĉu Empatio rajtas publikigi la pozicion de la uzanto al ties kontaktuloj?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr ""
+msgid "Empathy can use the network to guess the location"
+msgstr "Empatio rajtas uzi la reton por diveni la lokon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Ĉu Empatio rajtas uzi la reton por diveni la pozicion?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ĉu uzi la etoson por babilejoj?"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr ""
+"Empatio rajtas uzi la reton de la portebla telefono por diveni la lokon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-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 "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
+"Ĉu Empatio rajtas uzi la reton de la portebla telefono por diveni la "
+"pozicion?"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Administri babilaj kaj VoIP-kontojn"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empatio rajtas uzi la GPS-on por diveni la lokon"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Babilaj kaj VoIP-kontoj"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ĉu Empatio rajtas uzi la GPS-on por diveni la pozicion?"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empatio devas redukti la precizon pri la loko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Ĉu Empatio reduktu la precizecon de la loko pro privatec-kialoj?"
+
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Neniu kialo estis indikita"
+
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "La ŝanĝo de la stato estis petite"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Vi ĉesis la dosiertransigon"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "La alia partoprenanto ĉesis la dosiertransigon"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Eraro dum provi transigi la dosieron"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "La alia partoprenanto ne povas transigi la dosieron"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nekonata kialo"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "La ŝutado de la dosiero finiĝis, sed la dosiero estis difektita"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Ŝutado de dosieroj ne estas subtenata de la fora kontakto"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "La elektita dosiero ne estas regula"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "La elektita dosiero estas malplena"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Maltrafita voko de %s"
@@ -563,169 +583,138 @@ msgstr "Vokis %s"
 msgid "Call from %s"
 msgstr "Voko de %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Ingotipo estas nesubtenata"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Neniu kialo estis indikita"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "La ŝanĝo de la stato estis petite"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Vi ĉesis la dosiertransigon"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "La alia partoprenanto ĉesis la dosiertransigon"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Eraro dum provi transigi la dosieron"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "La alia partoprenanto ne povas transigi la dosieron"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nekonata kialo"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
-msgstr "Disponebla"
+msgstr "Disponeble"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Okupite"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "For"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevideble"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
-msgstr "Malkonektite"
+msgstr "Nekonektite"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Neniu kialo indikita"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stato estas agortite al nekonektite"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Reta eraro"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo fiaskis"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Ĉifrad-eraro"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Jam uzata nomo"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Neniu prezentigita atestilo"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Atestilo nekonfida"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Atestilo eksvalidiĝis"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Ne aktivigita atestilo"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Atestogastnomo malkongruas"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Atestilo-fingrospuro malkongruas"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Memkreita atestilo"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Atestil-eraro"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Ĉifrado ne estas diponebla"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Atestilo estas nevalide"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Konekto estas rifuzite"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Ne eblas starigi la konekton"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Perdis konekton"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ĉi tiu rimedo jam konektiĝis al la servilo"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Tiu konto jam estas konektite al la servilo"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "La konekto anstataŭiĝis per nova konekto uzanta la saman rimedon"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "La konto jam ekzistas sur la servilo"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "La servilo tro okupiĝas por trakti la konekton"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "La atestilo senvalidiĝis"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "La atestilo uzas nesekuran ĉifralgoritmon aŭ estas kriptografie malforta"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -733,283 +722,262 @@ msgstr ""
 "La longeco de la atestilo de la servilo, aŭ la profundeco de la ĉeno de la "
 "atestilo, superas la limojn faratajn de la kriptografia biblioteko"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Via programaro estas tro maljuna"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Interna eraro"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Proksimaj homoj"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Japana Yahoo!"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-babilejo"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Antaŭ %d sekundo"
 msgstr[1] "Antaŭ %d sekundoj"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Antaŭ %d minuto"
 msgstr[1] "Antaŭ %d minutoj"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Antaŭ %d horo"
 msgstr[1] "Antaŭ %d horoj"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Antaŭ %d tago"
 msgstr[1] "Antaŭ %d tagoj"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Antaŭ %d semajno"
 msgstr[1] "Antaŭ %d semajnoj"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Antaŭ %d monato"
 msgstr[1] "Antaŭ %d monatoj"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "en la estonteco"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Ĉiuj kontoj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Miaj surretaj _kontoj"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "La konto %s redaktiĝas per %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Ne eblas redakti la konton %s per Empatio."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Lanĉi miajn surretajn kontojn"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Redakti %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Uzantonomo:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_pliki"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "E_nsaluti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Tiu konto jam ekzistas sur la servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Krei novan konton sur la servilo"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "_Nuligi"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ĉe %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:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nova konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Ekzemplo:</b> MiaNomo"
+#: ../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:"
+msgstr "Pas_vorto:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Altnivele"
+msgid "Screen _Name:"
+msgstr "Ekran_nomo:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Ekzemplo:</b> MiaNomo"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pas_vorto:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Memori pasvorton"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Memori la pasvorton"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Pordo:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Memori pasvorton"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Ekran_nomo:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servilo:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Kio estas via AIM-pasvorto?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Altnivele"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Kio estas via AIM-nomo?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Pordo:"
+msgid "What is your AIM password?"
+msgstr "Kio estas via AIM-pasvorto?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servilo:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Ekzemplo:</b> uzantonomo"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Memori la pasvorton"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Ensalut-I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Ekzemplo:</b> uzantonomo"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Kio estas via uzantidentigilo ĉe GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Kio estas via pasvorto ĉe GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ĉe ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Ekzemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Sign_a agordo:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ĉe ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Kio estas via UIN ĉe ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Kio estas via ICQ-pasvorto?"
 
@@ -1046,11 +1014,23 @@ msgstr "Agordoj"
 msgid "None"
 msgstr "Neniu"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Reto"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Reto:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Signa agordo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serviloj"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1058,14 +1038,6 @@ msgstr ""
 "Plej multaj el la serviloj de IRC ne bezonas pasvorton, do se vi ne certas, "
 "ne enmetu pasvorton."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Reto"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Reto:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Kromnomo:"
@@ -1082,48 +1054,20 @@ msgstr "Ĉeso-mesaĝo:"
 msgid "Real name:"
 msgstr "Reala nomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serviloj"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Kio estas via kromnomon ĉe IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Kiu IRC-reto?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Ekzemplo:</b> uzanto@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Ekzemplo:</b> uzanto@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Ĉ_ifrado nepras (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnori erarojn de atestiloj de SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Superskribi agordojn de la servilo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_tato:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Kio estas via kromnomon ĉe IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ris_urco:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Kio estas via uzantonomo ĉe Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1133,181 +1077,205 @@ msgstr ""
 "Ĉi tio estas via uzantonomo, ne via kutima ensaluto ĉe Facebook.\n"
 "Se vi nomiĝas facebook.com/<b>zizelo</b>, enmetu <b>zizelo</b>.\n"
 "Uzu <a href=\\\"http://www.facebook.com/username/\\\">ĉi tiu paĝo</a> por "
-"elekti uzantnomon ĉe Facebook se vi ne jam havas."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Uzi malnovan SS_L"
+"elekti uzantonomon ĉe Facebook se vi ne jam havas."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Kio estas via pasvorto ĉe Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Kio estas via uzantnomo ĉe Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Kio estas via identigilo ĉe Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Ekzemplo:</b> uzanto@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Kio estas via pasvorto ĉe Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Ekzemplo:</b> uzanto@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnori erarojn de atestiloj de SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_tato:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ris_urco:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Ĉ_ifrado nepras (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Uzi malnovan SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Superskribi agordojn de la servilo"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Kio estas via identigilo ĉe Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Kio estas via pasvorto ĉe Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Kiun identigilon vi deziras ĉe Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Kio estas via pasvorto ĉe Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Kiun pasvorton vi deziras ĉe Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Ekzemplo:</b> uzanto@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Kio estas via identigilo ĉe Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Kio estas via pasvorto ĉe Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Ret_poŝtadreso:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Kromnomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Familia nomo:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Persona nomo:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Montrata nomo:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Familia nomo:"
+msgid "E-_mail address:"
+msgstr "Ret_poŝtadreso:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Montrata nomo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Uzantonomo:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Ekzemplo:</b> uzanto@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Aŭtentig-uzantonomo:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Eltrovi bindaĵon"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Eltrovi la servilon de STUN aŭtomate"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Uzi ĉi tiun konton por voki _fiskajn kaj poŝajn telefonojn"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignori erarojn de TLS"
+msgid "NAT Traversal Options"
+msgstr "Agordoj por transiro de NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (sekundoj)"
+msgid "Proxy Options"
+msgstr "Prokuril-agordoj"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Agordoj de vivodaŭrigo"
+msgid "Miscellaneous Options"
+msgstr "Diversaj agordoj"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Malstrikta enkursigo"
+msgid "STUN Server:"
+msgstr "STUN-servilo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Eltrovi la servilon de STUN aŭtomate"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Diversaj agordoj"
+msgid "Discover Binding"
+msgstr "Eltrovi bindaĵon"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Agordoj por transiro de NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servilo:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Agordoj de vivodaŭrigo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Pordo:"
+msgid "Mechanism:"
+msgstr "Mekanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Prokuril-agordoj"
+msgid "Interval (seconds)"
+msgstr "Intervalo (sekundoj)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Aŭtentig-uzantonomo:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-servilo:"
+msgid "Loose Routing"
+msgstr "Malstrikta enkursigo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Servilo:"
+msgid "Ignore TLS Errors"
+msgstr "Ignori erarojn de TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporto:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Uzi ĉi tiun konton por voki _fiskajn kaj poŝajn telefonojn"
+msgid "Port:"
+msgstr "Pordo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Kio estas via pasvorto por via konto de SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Kio estas via ensalut-identigilo de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Uzantonomo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Kio estas via pasvorto por via konto de SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnori konferencajn kaj babilejajn invitojn"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Lokaĵaro por la ĉambrolisto:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Kio estas via identigilo ĉe Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Kio estas via pasvorto ĉe Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Lokaĵaro por la ĉambrolisto:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1323,7 +1291,7 @@ msgstr "Malsukcesis konservi la bildon en dosieron"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
-msgstr "Elekti bildon por via avataro"
+msgstr "Elekti bildon por via uzantobildo"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
@@ -1345,61 +1313,65 @@ msgstr "Ĉiuj dosieroj"
 msgid "Click to enlarge"
 msgstr "Klaku por pligrandigi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Okazis eraro dum komenci la vokon"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "La indikita kontakto ne subtenas vokojn"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "La indikita kontakto estas malkonektita"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "La indikita atestilo nevalidas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Krizajn vokojn ne subtenas ĉi tiu protokolo"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Via kredito ne sufiĉas por fari tiun vokon"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Malsukcesis malfermi privatan babilejon"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Ĉi tiu konversacio ne subtenas temojn"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Vi ne rajtas ŝanĝi la temon"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” ne estas valida identigo de kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Vakigi ĉiujn mesaĝojn el la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temo>: Ŝangi la temon de la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID de babilo-ĉambro>: eniri novan babilo-ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID de babilo-ĉambro>: eniri novan babilo-ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1407,24 +1379,24 @@ msgstr ""
 "/part [<ID de babil-ĉambro>] [<kialo>]: forlasi la babil-ĉambron, defaŭlte "
 "la aktualan"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID de kontakto> [<mesaĝo>]: malfermi privatan babilon"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID de kontakto> <mesaĝo>: malfermi privatan babilon"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kromnomo>: Ŝanĝi vian kromnomon ĉe la aktuala servilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr ""
 "/me <mesaĝo>: sendi mesaĝon de “ACTION” (ago) al la aktuala konversacio"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1434,11 +1406,11 @@ msgstr ""
 "tion por sendi mesaĝon kiu komencas per ‘/’. Ekzemple: “/say /join uziĝas "
 "por eniri ĉambrojn”"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID de kontakto>: montri informon pri kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1446,113 +1418,127 @@ msgstr ""
 "/help [<komando>]: montri ĉiujn subtenatajn komandojn. Se <komando> estas "
 "difinita, montri ĝian uzon."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uzo: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nekonata komando"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nekonata komando; vidu /help por la uzeblaj komandoj"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "kredito ne sufiĉas por sendi la mesaĝon"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Eraris sendi mesaĝon ‘%s’: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Eraro dum sendo de mesaĝo: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"bilanco ne sufiĉas por sendi la mesaĝon. <a href='%s'>Plenumi konton</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ne kapablas"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "nekonektite"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "nevalida kontakto"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "aliro malpermesita"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "tro longa mesaĝo"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "ne realigite"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nekonate"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Eraris sendi mesaĝon ‘%s’: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Eraro dum sendo de mesaĝo: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Temo:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "La temo ŝanĝiĝis al: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "La temo ŝanĝiĝis de %s al: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Neniu temo estas definita"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Neniuj proponoj)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Aldoni '%s' al vortaro"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aldoni '%s' al %s vortaro"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Enmeti miensimbolon"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Sendi"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Literumadaj proponoj"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Malsukcesis akiri la ĵusajn protokolojn"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s malkonektiĝis"
@@ -1560,12 +1546,12 @@ msgstr "%s malkonektiĝis"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s estas forpelita de %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s estas forpelita"
@@ -1573,17 +1559,17 @@ msgstr "%s estas forpelita"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s estas ekzilita de %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s estas ekzilita"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s forlasis la ĉambron"
@@ -1593,17 +1579,17 @@ msgstr "%s forlasis la ĉambron"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s aliĝis la ĉambron"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nun estas konata kiel %s"
@@ -1611,90 +1597,90 @@ msgstr "%s nun estas konata kiel %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:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Malkonektite"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Ĉu vi volas konservi ĉi tiun pasvorton?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Memorigi"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne nun"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reprovi"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Malĝusta pasvorto; bonvolu reprovi:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Pasvorto gardas ĉi tiun ĉambron:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Aliĝi"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Konektite"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Konversacio"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Nekonata aŭ nevalida identigilo"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktblokado portempe ne eblas"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Kontaktblokado ne eblas"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Aliro malpermesita"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Malsukcesis bloki kontakton"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Redakti blokitajn kontaktojn"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1704,464 +1690,369 @@ msgstr "Blokitaj kontaktoj"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Forigi"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopii la ligiladreson"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Malfermi la ligil_on"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Redakti kontakto-informojn"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personaj informoj"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nova kontakto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Ĉu bloki na %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Ĉu vi certas ke vi volas bloki ‘%s’ de kontakti vin plu?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloki"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Raporti ĉi tiun kontakton kiel mistraktema"
 msgstr[1] "_Raporti ĉi tiujn kontaktojn kiel mistraktemaj"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidi _poste"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Abonpeto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloki uzanton"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupite"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Legosignitaj homoj"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ĉu vi vere volas forigi la grupon ‘%s’?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Forigi grupon"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "Fo_rigi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ĉu vi vere volas forigi la kontakton ‘%s’?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Forigi kontakton"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Aldoni kontakton…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Bloki kontakton"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Babilejo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Sonalvoko"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videoalvoko"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Antaŭaj konversacioj"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Sendi dosieron"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Komunigi mian labortabelon"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Librosigno"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "R_edakti"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Invitas vin al tiu ĉi ĉambro"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Inviti al babil-ĉambro"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidi _poste"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Serĉi kontaktojn"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Serĉi: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Aldoni kontakton"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ne trovis kontaktojn"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Via mesaĝo por enkonduki vin:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Bonvolu permesi min vidi kiam vi konektas. Dankon!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Elekti kontakton"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Tuta nomo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonnumero:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Retpoŝtadreso:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Retpaĝaro:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Naskiĝtago:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Lasta vido:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Konektite de:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Foresto-mesaĝo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanaloj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Landkodo de ISO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Lando:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Ŝtato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Urbo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Areo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Poŝtkodo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Strato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Konstruaĵo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Etaĝo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Ĉambro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Priskribo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivelo de precizo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Eraro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikala eraro (metroj):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontala eraro (metroj):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Rapido:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Direkto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Rapideco de altiĝo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Laste aktualigita je:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitudo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Loko"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%ea de %B, %Y je %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
-msgstr "Konservi la avataron"
+msgstr "Konservi la uzantobildon"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
-msgstr "Malsukcesis konservi la avataron"
+msgstr "Malsukcesis konservi la uzantobildon"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Pozicio</b> je (dato)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Kromnomo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klientaj informoj"
-
-# babililo = chat-tool
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Kliento:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personaj detaloj"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Kontaktdetaloj"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Tuta nomo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefonnumero"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Retpoŝtadreso"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Retejo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Naskiĝtago"
+
+#. 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 "Lasta vido:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Konektite de:"
+
+#. 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 "Foresto-mesaĝo:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "laboro"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "hejmo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "poŝtelefono"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voĉo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferate"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcelo"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identigilo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Kromnomo:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Pozicio</b> je (dato)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Informoj petitaj…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Klientaj informoj"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "Mastruma sistemo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+# babililo = chat-tool
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Kliento:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupoj"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2169,105 +2060,171 @@ msgstr ""
 "Elektu la grupojn en kiuj vi volas ke ĉi tiu kontakto aperos. Rimarku ke oni "
 "povas elekti pli ol unu grupo aŭ neniom grupoj."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Aldoni grupon"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Elekti"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La jena idento blokiĝos:"
 msgstr[1] "La jenaj identoj blokiĝos:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Ne eblas bloki la jena idento:"
 msgstr[1] "Ne eblas bloki la jenaj identoj:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Ligitaj kontaktoj"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Elekti kontaktojn por ligi"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Antaŭrigardo de nova kontakto"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontaktoj elektitaj en la maldekstra listo kunligiĝos."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Redakti kontakto-informojn"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Elekti konton kiun uziĝos por voki"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Voko"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Poŝtelefono"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Laboro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hejmo"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Bloki kontakton"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Babilejo"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Sonalvoko"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videoalvoko"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Antaŭaj konversacioj"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Sendi dosieron"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Komunigi mian labortabelon"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Librosigno"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ne estas instalite"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Bonvole instalu la pakaĵon \"gnome-contacts\" por aliri kontakt-detalojn."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edakti"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ligi kontaktojn…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Invitas vin al tiu ĉi ĉambro"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Inviti al babil-ĉambro"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Aldoni kontakton…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Forviŝi kaj _bloki"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ĉu vi vere volas forigi la grupon ‘%s’?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Forigi grupon"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "Fo_rigi"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ĉu vi vere volas forigi la kontakton ‘%s’?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2276,7 +2233,11 @@ msgstr ""
 "Ĉu vere vi volas forigi la ligitan kontakton ‘%s’? Rimarku ke tio forigos "
 "ĉiujn kontaktojn kiuj ligiĝas al ĉi tiu kontakto."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Forigi kontakton"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2287,23 +2248,23 @@ msgstr[1] "Ligitaj kontaktoj enhavantaj %u kontaktoj"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Pozicio</b> je (dato)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Konektita per telefono aŭ portebla aparato"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova reto"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Elekti IRC-reton"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Redefaŭltigi la liston"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Elekti"
@@ -2316,249 +2277,252 @@ msgstr "nova servilo"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Ligi kontaktojn"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Malligi…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Tute dividi la montratajn ligitajn kontaktojn al apartaj kontaktoj"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Ligi"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Ĉu malligi la ligitajn kontaktojn ‘%s’?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ĉu vi certas ke vi volas malligi ĉi tiujn ligitajn kontaktojn? Tio tute "
-"dividos la ligitajn kontaktojn al apartaj kontaktoj."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Malligi"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historio"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Montri"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Serĉi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Babili en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Babili kun %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekundo"
 msgstr[1] "%s sekundoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Voko daŭris %s, finiĝis je %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hodiaŭ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Iam ajn"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Iu ajn"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kiu"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kiam"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Io ajn"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Tekstaj babiloj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Venantaj vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Elirantaj vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Maltrafitaj vokoj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Kio"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Ĉu vi certas ke vi volas forviŝi ĉiujn protokolojn de antaŭaj konversacioj?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Vakigi ĉion"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Forigi de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Ŝargante…</span>"
+msgid "_File"
+msgstr "_Dosiero"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Babilejo"
+#: ../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 "R_edakti"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Forigi la tutan historion..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Babilejo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_edakti"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Dosiero"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "paĝo 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakt-ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ŝargante…</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "La kontakto estas nekonetite"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Babilo"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "La indikita kontakto estas aŭ nevalida aŭ nekonata"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "La kontakto ne subtenas tiun specon de konversacio"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "La petita trajto ne estas realigita por tiu protokolo."
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ne eblas komenci konversacion kun la donata kontakto"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Vi estas ekzilita de tiu kanalo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "La kanalo estas plena"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Vi estu invitita por aliĝi al tiu kanalo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ne eblas procedi dum nekonekto"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permeso rifuzita"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Okazis eraro dum komenco de konversacio"
+
+#: ../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 "Enigu la identililon aŭ la telefonnumeron de la kontakto:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nova konversacio"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Sendi _videon"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Videoalvoko"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Voki"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Sonalvoko"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nova voko"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Aŭtentokontrolo fiaskis je la konto <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"
@@ -2595,12 +2559,8 @@ msgstr "Klaku por librosigni ĉi tiun staton"
 msgid "Set status"
 msgstr "Agordi staton"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Aktualigi vian ĉeestecon kaj staton"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Kutimaj mesaĝoj…"
 
@@ -2608,7 +2568,7 @@ msgstr "Kutimaj mesaĝoj…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nova %s konto"
@@ -2618,20 +2578,20 @@ msgid "Find:"
 msgstr "Serĉi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Uskleca _kongruo"
+msgid "_Previous"
+msgstr "_Antaŭa"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frazo ne trovita"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Sekva"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Uskleca _kongruo"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Antaŭa"
+msgid "Phrase not found"
+msgstr "Frazo ne trovita"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2677,12 +2637,12 @@ msgstr "Voĉa voko finiĝis"
 msgid "Edit Custom Messages"
 msgstr "Redakti kutimajn mesaĝojn"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mesaĝo redaktiĝis je %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normale"
 
@@ -2759,34 +2719,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nomo en la atestilo: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Daŭrigi"
+msgid "C_ontinue"
+msgstr "_Daŭrigi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nefidanta konekto"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ĉi tiu konekto ne konfidas. Ĉu vi volus konekti malgraŭ tio?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Memori ĉi tiun elekton por estontaj konektoj"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detaloj de la atestilo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Malsukcesis malfermi la URIon"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Elekti dosieron"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Mankas sufiĉa spaco por konservi la dosieron"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2795,7 +2759,7 @@ msgstr ""
 "%s da libera spaco necesas por konservi ĉi tiun dosieron, sed nur %s "
 "disponeblas. Bonvolu elekti alian lokon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Venanta dosiero de %s"
@@ -2830,7 +2794,7 @@ msgstr "Kelta"
 #: ../libempathy-gtk/totem-subtitle-encoding.c:187
 #: ../libempathy-gtk/totem-subtitle-encoding.c:189
 msgid "Central European"
-msgstr "Mezeŭropa"
+msgstr "Mezeŭrope"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:192
 #: ../libempathy-gtk/totem-subtitle-encoding.c:194
@@ -2967,39 +2931,31 @@ msgstr "Okcidenta"
 msgid "Vietnamese"
 msgstr "Vjetnama"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "La elektita kontakto ne povas ricevi dosierojn."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "La elektita kontakto estas senkonektita."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Neniu erarmesaĝo"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Tujmesaĝo (Empatio)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ne konekti dum lanĉo"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne montri la kontaktliston aŭ iun alian dialogon dum lanĉo"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Tujmesaĝilo 'Empatio'"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Eraro dum kontakti la mastrumilon de kontoj"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3032,7 +2988,7 @@ msgid ""
 "details."
 msgstr ""
 "Empatio estas distribuata kun la espero ke ĝi estas utila, sed SEN IU "
-"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŬGECO POR SPECIFA "
+"GARANTIO; eĉ sen implicita garantio de NEGOCEBLO aŭ TAŬGECO POR SPECIFA "
 "CELO. Vidu la Ĝeneralan Publikan Permesilon de GNU por pli da detaloj."
 
 #: ../src/empathy-about-dialog.c:89
@@ -3043,18 +2999,19 @@ msgid ""
 msgstr ""
 "Vi devintus ricevi kopion de la Ĝenerala Publika Permesilo de GNU kun "
 "Empatio; se ne, skribu al Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-1301 USA"
+"Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Tujmesaĝilo por GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Aisano https://launchpad.net/~info-ais-sanmarino\n"
 "  Brient Hess https://launchpad.net/~brient\n"
+"  Diego Souza https://launchpad.net/~diegosouza-br-deactivatedaccount\n"
 "  Eliovir https://launchpad.net/~eliovir\n"
 "  ISHII Eiju https://launchpad.net/~lumidina\n"
 "  Javier Lancha https://launchpad.net/~javierlancha\n"
@@ -3062,230 +3019,90 @@ msgstr ""
 "  Kvantumo https://launchpad.net/~ordnascrazy\n"
 "  Lucas Larson https://launchpad.net/~lucaslarson\n"
 "  Michael Moroni https://launchpad.net/~airon90\n"
-"  Petr Adam Dohnálek https://launchpad.net/~dohnp5a1\n"
+"  Patrick (Petriko) Oudejans https://launchpad.net/~patrickoudejans\n"
+"  Petrus Adamus https://launchpad.net/~dohnp5a1\n"
 "  Robert BOGENSCHNEIDER https://launchpad.net/~robog\n"
 "  Serge Leblanc https://launchpad.net/~serge-leblanc\n"
+"  Serge Leblanc https://launchpad.net/~serge-leblanc-wanadoo\n"
 "  Shane D https://launchpad.net/~dimensional\n"
 "  Yamiharu https://launchpad.net/~yamiharu84\n"
 "GNOME Contributions:\n"
 "  Neil ROBERTS"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Eraro okazis dum importi la kontojn."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Eraro okazis dum sintakse analizi la detalojn de la konto."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Eraro okazis dum krei la konton."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Okazis eraro."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "La erarmesaĝo estis: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Vi povas aŭ iri reen kaj reprovi enmeti la detalojn de via konto aŭ eliri el "
-"ĉi tiu asistanto kaj aldoni kontojn poste per la menuo ‘Redakti’."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Eraro aperis"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Kian babilkonton vi havas?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ĉu vi havas aliajn babilkontojn kiujn vi volas agordi?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Enmetu la detalojn de via konto"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Kian babilkonton vi volas krei?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Ĉu vi volas krei aliajn babilkontojn?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Enmetu la detalojn de la nova konto"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Per Empatio oni povas babili kun homoj konektitaj proksime kaj kun amikoj "
-"kaj kolegoj kiu uzas Google Talk, AIM, Windows Live kaj multajn aliajn "
-"babilaplikaĵojn. Per mikrofono aŭ retkamerao oni povas babili ankaŭ sone aŭ "
-"videe."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ĉu vi havas konton kiun vi uzas en alia babilaplikaĵo?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Jes, enportu la detalojn de mia konto el "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Jes, mi enmetos la detalojn de mia konto nun"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ne, mi volas novan konton"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, mi nur volas vidi homojn kiuj estas konektitaj proksime dumtempe"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Elektu la kontojn kiujn vi volas importi:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Jes"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ne, tio sufiĉas nun"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empatio povas aŭtomate eltrovi la homojn kiu konektis al la sama reto kiel "
-"vi kaj babili kun ili. Se vi volas uzi ĉi tiun trajton, bonvolu kontroli ĉu "
-"la jenaj detaloj ĝustas. Oni povas facile ŝanĝi ĉi tiujn detalojn poste aŭ "
-"elŝalti ĉi tiun trajton per uzi la dialogon de ‘Kontoj’."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Redakti->Kontoj"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Mi _ne volas enŝalti ĉi tiun trajton nun"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Vi ne povos babili kun homoj konektitaj al via proksima reto, ĉar telepathy-"
-"salut ne instaliĝis. Se vi volas enŝalti ĉi tiun trajton, bonvolu instali la "
-"pakaĵon ‘telepathy-salut’ kaj krei konton de proksimaj homoj per la dialogo "
-"de kontoj."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ne instaliĝis"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistanto por kontoj de mesaĝado kaj VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Bonvenon al Empatio"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importi viajn ekzistajn kontojn"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Bonvolu enmeti viajn personajn detalojn"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Estas nekonservitaj ŝanĝoj al via konto ‘%s’."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Via nova konto ankoraŭ ne konserviĝis."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Konektante…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Nekonektite — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Nekonektite — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Nekonektite — Neniu retkonekto"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nekonata stato"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Nekonektite — Konto estas elŝaltite"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Redakti konekto-parametrojn"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"Vi estas kreonta novan konton kiu forviŝos\n"
-"vian ŝanĝojn. Ĉu vi certas ke vi volas daŭri?"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "R_edakti konekto-parametrojn..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ĉu vi volas forigi %s de la komputilo?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ĉi tio ne forigos vian konton ĉe la servilo."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3294,15 +3111,23 @@ msgstr ""
 "viajn ŝanĝojn. Ĉu vi certas ke vi volas daŭri?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "E_nŝalti"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "E_lŝalti"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "Preterpa_si"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Konekti"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3314,19 +3139,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Aldoni…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Ŝargi kontoinformojn"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Neniu protokolo estas instalita"
+msgid "_Import…"
+msgstr "E_nporti…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokolo:"
+msgid "Loading account information"
+msgstr "Ŝargi kontoinformojn"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3334,132 +3155,116 @@ msgstr ""
 "Por aldoni novan konton, oni unue devas instali modulon por ĉiu protokolo "
 "kiun oni volas uzi."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importi…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Neniu protokolo-internaĵo estas instalita"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
-msgstr "- Aŭtentkontrola kliento de Empathy"
+msgstr " - Aŭtentkontrola kliento de Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Aŭtentkontrola kliento de Empatio"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Proksimaj homoj"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Sona/videa kliento de Empatio"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Sona/videa kliento de Empatio"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrasto"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Heleco"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamo"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Laŭteco"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Flanka breto"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Sonenigo"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Videoenigo"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Ciferplato"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detaloj"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Voko kun %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "La IP-adreso vidata de la maŝino"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La IP-adreso vidata de servilo ĉe la Interreto"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La IP-adreso de la kliento vidata de la alia flanko"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "La IP-adreso de relajsa servilo"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "La IP-adreso de la plurelsendgroupo"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nekonate"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nekonate"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nekonate"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Konektite — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Teknikaj detaloj"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3467,8 +3272,8 @@ msgid ""
 msgstr ""
 "La programaro de %s komprenas neniun sonformon subtenata per via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3476,8 +3281,8 @@ msgid ""
 msgstr ""
 "La programaro de %s komprenas neniun videformon subtenata per via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3486,25 +3291,25 @@ msgstr ""
 "Ne eblas sukcese konekti al %s. Eble unu el vi uzas reton kiu ne permesas "
 "rektajn konektojn."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Okazis paneo je la reto"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "La necesasj sonformoj por ĉi tiu voko ne instaliĝis ĉe via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "La necesaj videoformoj por ĉi tiu voko ne instaliĝis ĉe via komputilo"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3515,263 +3320,311 @@ msgstr ""
 "ĉi tiun cimon</a> kaj afiŝi la protokolojn kiujn oni povas kolekti per la "
 "sencimig-fenestro en la helpmenuo."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Eraro okazis en la vokmodulo"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "La fino de la fluo atingiĝis"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ne eblas starigi la sonfluon"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ne eblas starigi la videfluon"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Sono"
+msgid "_Call"
+msgstr "_Voko"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Malkodanta kodeko:"
+msgid "_Microphone"
+msgstr "_Mikrofono"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Elŝalti la kamaraon"
+msgid "_Camera"
+msgstr "_Filmilo"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Montri la ciferplaton"
+msgid "_Settings"
+msgstr "_Agordoj"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodanta kodeko:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Vido"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Fini vokon"
+#: ../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 "_Helpo"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Fini la aktualan vokon"
+#: ../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 "_Enhavoj"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Loka kandidato:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Sencimigo"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maksimumigi min"
+msgid "Swap camera"
+msgstr "Interŝanĝi filmilojn"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimumigi min"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Fora kandidato:"
+msgid "Maximise me"
+msgstr "Maksimumigi min"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Sendi sonon"
+msgid "Disable camera"
+msgstr "Elŝalti la kamaraon"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Sendi videon"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Fini vokon"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Montri la ciferplaton"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Fini la aktualan vokon"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "_Videoalvoko"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Komenci videvokon"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Komenci sonvokon"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Interŝanĝi filmilojn"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Baskuligi la sonan transsendon"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Baskuligi la videan transsendon"
+msgid "Show dialpad"
+msgstr "Montri la ciferplaton"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nekonate"
+msgid "Display the dialpad"
+msgstr "Montri la ciferplaton"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Sendi videon"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "_Videoalvoko"
+msgid "Toggle video transmission"
+msgstr "Baskuligi la videan transsendon"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Voko"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Sendi sonon"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Filmilo"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Enhavoj"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Baskuligi la sonan transsendon"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Sencimigo"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodanta kodeko:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Helpo"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nekonate"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Malkodanta kodeko:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofono"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Fora kandidato:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Agordoj"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Loka kandidato:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Vido"
+msgid "Audio"
+msgstr "Sono"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Ĉu fermi la fenestron?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Fermante tiun fenstron vi forlasas na %s. Vi ne ricevos iun venontan mesaĝon "
+"ĝis vi realiĝis al ĝi."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Fermante tiun fenstron vi forlasas babilejon. Vi ne ricevos iun venontan "
+"mesaĝon ĝis vi realiĝis al ĝi."
+msgstr[1] ""
+"Fermante tiun fenstron vi forlasas %u babilejojn. Vi ne ricevos iun venontan "
+"mesaĝon ĝis vi realiĝis al ĝi."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Ĉu forlasi na %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Vi ne ricevos iun venontan mesaĝon de tiu babilejo ĝis vi realiĝis al ĝi."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Fermi la fenestron"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlasi ĉambron"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d nelegite)"
 msgstr[1] "%s (%d nelegite)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (kaj %u alia)"
 msgstr[1] "%s (kaj %u aliaj)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d nelegita de aliaj)"
 msgstr[1] "%s (%d nelegitaj de aliaj)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d nelegita de ĉiuj)"
 msgstr[1] "%s (%d nelegitaj de ĉiuj)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sendante %d mesaĝon"
 msgstr[1] "Sendante %d mesaĝojn"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skribante mesaĝon."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Vakigi"
+msgid "_Conversation"
+msgstr "_Konversacio"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakto"
+msgid "C_lear"
+msgstr "_Vakigi"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Aldoni _miensimbolon"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Librosignita babilĉambro"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Inviti _partoprenanton…"
+msgid "Notify for All Messages"
+msgstr "Atentigi pri ciuj mesaĝoj"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Movi la langeton _maldekstren"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Montri kontaktliston"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Movi la langeton _dekstren"
+msgid "Invite _Participant…"
+msgstr "Inviti _partoprenanton…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Atentigi pri ciuj mesaĝoj"
+msgid "C_ontact"
+msgstr "K_ontakto"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Konversacio"
+msgid "_Tabs"
+msgstr "_Langetoj"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Malligi langeton"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Librosignita babilĉambro"
-
-#: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "_Sekva langeto"
-
-#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "_Antaŭa langeto"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Montri kontaktliston"
-
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Langetoj"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "Sekva la_ngeto"
 
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Undo Close Tab"
 msgstr "_Malfari fermon de langeto"
 
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Movi langeton ma_ldekstren"
+
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Movi langeton maldekst_ren"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Malligi langeton"
+
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "Nomo"
@@ -3784,100 +3637,100 @@ msgstr "Ĉambro"
 msgid "Auto-Connect"
 msgstr "Aŭtomata konekto"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Administri librosignitajn ĉambrojn"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
-msgstr "Venanta videotelefon-voko"
+msgstr "Venanta video-voko"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Venanta telefonvoko"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vokas vin videe. Ĉu vi volas respondi?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vokas vin. Ĉu vi volas respondi?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Venanta voko de %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rifuzi"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Respondo"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Respondi per video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Venenta videvoko de %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Ĉambrinviton"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Inviton por aliĝi al %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s invitas vin por aliĝi al %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Malakcepti"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Aliĝi"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s invitis vin por aliĝi al %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vi invitiĝis por aliĝi al %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Venanta dosiertransigo de %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Pasvorto bezonatas"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s volus permeson por scii kiam vi konektas"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3887,105 +3740,105 @@ msgstr ""
 "Mesaĝo: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nekonate"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s ĉe %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Ricevante \"%s\" de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sendante \"%s\" al %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Eraro okazis dum ricevi “%s” de %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Eraro okazis dum ricevi dosieron"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Eraro okazis dum sendi “%s” al %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Eraro okazis dum sendi dosieron"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "“%s” riceviĝis de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "“%s” sendiĝis al %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Dosiertransigo finiĝis"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Atendante respondon de la alia partoprenanto"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Kontrolante la integrecon de “%s”"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Haketante “%s”"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Dosiero"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restante"
 
@@ -3997,7 +3850,11 @@ msgstr "Dosiertransigoj"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Forigi kompletajn, nuligitajn kaj fuŝajn dosiertransigojn el la listo"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "E_nporti"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4005,171 +3862,196 @@ msgstr ""
 "Neniuj importeblaj kontoj troviĝis. Empatio aktuale subtenas importi kontojn "
 "de nur Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Enporti kontojn"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Enporti"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokolo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Fonto"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Provizi pasvorton"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Malkonekti"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Vi agordu konton por vidi kontaktojn ĉi tie."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Neniu kongruaĵo troviĝis"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Pardonu, %s kontoj ne povas uzataj ĝis via programaro %s estas ĝisdatigita."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Ĝisdatigi programaron..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Fermi"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Rekonekti"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redakti konton"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Fermi"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
-msgstr "Plenumi la konton %s (%s)…"
+msgstr "Plenumi la konton %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Plenumi krediton en konto"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
-msgstr "Plenumi konton…"
+msgstr "Plenumi konton..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Vi enŝaltu unu de viaj kontoj por vidi kontaktojn ĉi tie."
+
+#. 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 "Vi enŝaltu na %s por vidi kontaktojn ĉi tie."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktlisto"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontaktoj sur _mapo"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Konto-agordoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Bilanco de konto"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova konversacio…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Serĉi en kontakt_listo"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _voko…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Aliĝi al librosignitajn ĉambrojn"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Serĉi kontaktojn…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Administri librosignitajn ĉambrojn"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Dosiertransigoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormala grandeco"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Nekonektaj kontaktoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nova _voko…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Montri p_rotokolojn"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normala grandeco kun _avataroj"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Bilanco de konto"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontaktoj sur _mapo"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Kontoj"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blokitaj kontaktoj"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "Ago_rdoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Montri p_rotokolojn"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Serĉi en kontakt_listo"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordigi laŭ _nomo"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordigi laŭ _stato"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Kontoj"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normala grando kun _uzantobildoj"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokitaj kontoj"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormala grando"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
-msgstr "_Kompakta grandeco"
+msgstr "_Kompakta grando"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Dosiertransigoj"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Ĉamb_ro"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Aliĝi…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nova konversacio…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Nekonektaj kontaktoj"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personaj informoj"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Ĉamb_ro"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Aliĝi al librosignitajn ĉambrojn"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Serĉi kontaktojn…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Administri librosignitajn ĉambrojn"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Babilĉambro"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membroj"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4182,22 +4064,27 @@ msgstr ""
 "Pasvorto bezonata: %s\n"
 "Membroj: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Jes"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ne eblas komenci listi la ĉambrojn"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ne eblis ĉesi listi la ĉambrojn"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ne eblis ŝargi ĉambroliston"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Aliĝi al ĉambro"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4207,6 +4094,10 @@ msgstr ""
 "ĉambroj en la liston."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Ĉamb_ro:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4214,374 +4105,397 @@ msgstr ""
 "Enmetu la servilon kiu gastigas la ĉambron, aŭ lasu ĝin malplena se la "
 "ĉambro estas ĉe la servilo de la aktuala konto"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Aliĝi al ĉambro"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ne eblis ŝargi ĉambroliston"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Ĉambrolisto"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Ĉamb_ro:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Ricevis mesaĝon"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Sendis mesaĝon"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nova konversacio"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontakto malkonektas"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Kontakto konektas"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakto konektas"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konto konektis"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konto malkonektis"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Lingvo"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # Traduko de Remeo kaj Julieta venas de:
 # http://donh.best.vwh.net/Esperanto/Literaturo/Revuoj/np/np5602/romeo_julieta.html
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo! Kial estas vi Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "La patron neu kaj la nomon ĵetu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Aŭ, se ne tio, ĵuru vin nur mia,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "kaj mi ne estos Kapuleto plu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Ĉu plu aŭskulti, aŭ jam nun paroli?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr "Juliet malkonektis"
+msgstr "Juliet nekonektiĝis"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Agordoj"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Montri _miensimbolojn kiel bildoj"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Montri la kontakt_liston en ĉambroj"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Aspekto"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Konduto"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Komenci babilejojn en:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Babileja _etoso:"
+msgid "new ta_bs"
+msgstr "novaj _langetoj"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Elŝalti sciigojn kiam oni foras aŭ okupiĝas"
+msgid "new _windows"
+msgstr "novaj _fenestroj"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Elŝalti sonojn kiam oni for_as aŭ okupiĝas"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Montri venantajn mesaĝojn en la sciiga areo"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Aŭtomate konekti je la lanĉo"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Eĥo-nuligado plibonigas la klarecon de via voĉo al la alia babilanto, sed ĝi "
-"povas kaŭzi problemojn ĉe kelkaj komputiloj. Se vi aŭ la alia babilanto "
-"aŭdas strangajn bruojn aŭ eraretojn dum vokoj, provu elŝalti la eĥo-"
-"nuligadon kaj rekomencu la vokon. "
+msgid "Log conversations"
+msgstr "Protokoli konversaciojn"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Enŝalti sciigojn kiam kontakto konektas"
+msgid "Behavior"
+msgstr "Konduto"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Enŝalti sciigojn kian kontakto malkonektas"
+msgid "General"
+msgstr "Ĝenerale"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Enŝalti sciigojn kiam la _babilo ne estas fokusita"
+msgid "_Enable bubble notifications"
+msgstr "Ŝ_alti vezikajn atentigojn"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Enŝalti literumkontrolon por la lingvoj:"
+msgid "Disable notifications when _away or busy"
+msgstr "Elŝalti sciigojn kiam oni foras aŭ okupiĝas"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Ĝenerale"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Enŝalti sciigojn kiam la _babilo ne estas fokusita"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Nivelo de enigo:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Enŝalti sciigojn kiam kontakto konektas"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Laŭteco de enigo:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Enŝalti sciigojn kian kontakto malkonektas"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Atentigoj"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Lokfontoj:"
+msgid "_Enable sound notifications"
+msgstr "Aktivigi sonajn at_entigojn"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Protokoli konversaciojn"
+msgid "Disable sounds when _away or busy"
+msgstr "Elŝalti sonojn kiam oni for_as aŭ okupiĝas"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Atentigoj"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Ludi sonojn por eventoj"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sonoj"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privateco"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Uzi eĥo-nuligadon por plibonigi vokkvaliton"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Kiam la precizo de la loko reduktiĝas, nenio pli preciza ol la urbo, ŝtato "
-"kaj lando publikiĝos. Koordinatoj de GPS precizos je nur 1 decimalo."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Montri _miensimbolojn kiel bildoj"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Montri la kontakt_liston en ĉambroj"
+"Eĥo-nuligado plibonigas la klarecon de via voĉo al la alia babilanto, sed ĝi "
+"povas kaŭzi problemojn ĉe kelkaj komputiloj. Se vi aŭ la alia babilanto "
+"aŭdas strangajn bruojn aŭ eraretojn dum vokoj, provu elŝalti la eĥo-"
+"nuligadon kaj rekomencu la vokon."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sonoj"
+msgid "_Publish location to my contacts"
+msgstr "_Publikigi mian lokon al miaj kontaktoj"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Literumkontrolo"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"La listo de lingvoj enhavas nur la lingvojn por kiuj vortaro instaliĝis."
+"Kiam la precizo de la loko reduktiĝas, nenio pli preciza ol la urbo, ŝtato "
+"kaj lando publikiĝos. Koordinatoj de GPS precizos je nur 1 decimalo."
 
+#. 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 "Themes"
-msgstr "Etosoj"
+msgid "_Reduce location accuracy"
+msgstr "_Redukti la precizon de la loko"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Variaĵo:"
+msgid "Privacy"
+msgstr "Privateco"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Aŭtomate konekti je la lanĉo"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Poŝtelefono"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "Ŝ_alti vezikajn atentigojn"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Reto (IP, Sendrata)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Aktivigi sonajn at_entigojn"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Lokfontoj:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Reto (IP, Sendrata)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La listo de lingvoj enhavas nur la lingvojn por kiuj vortaro instaliĝis."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "Malfermi n_ovajn babilojn en propraj fenestroj"
+msgid "Enable spell checking for languages:"
+msgstr "Enŝalti literumkontrolon por la lingvoj:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "_Publikigi mian lokon al miaj kontaktoj"
+msgid "Spell Checking"
+msgstr "Literumkontrolo"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Babileja _etoso:"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "_Redukti la precizon de la loko"
+msgid "Variant:"
+msgstr "Variaĵo:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Etosoj"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stato"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Ĉ_esi"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Voki la kontakton denove"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Filmilo elŝaltita"
+msgid "Redial"
+msgstr "Revoki"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Filmilo enŝaltita"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video elŝaltita"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Elŝalti la filmilon kaj ĉesi elsendi videon"
+msgid "Video Preview"
+msgstr "Videa antaŭvido"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Enŝalti la filmilon kaj elsendi videon"
+msgid "Video On"
+msgstr "Video enŝaltita"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Enŝalti la filmilon sed ne elsendi videon"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Voki la kontakton denove"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Antaŭrigardo"
+msgid "Camera Off"
+msgstr "Filmilo elŝaltita"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Revoki"
+msgid "Disable camera and stop sending video"
+msgstr "Elŝalti la filmilon kaj ĉesi elsendi videon"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Antaŭrigardo"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video elŝaltita"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Enŝalti la filmilon sed ne elsendi videon"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video enŝaltita"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Filmilo enŝaltita"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videa antaŭvido"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Enŝalti la filmilon kaj elsendi videon"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vido de la mapo de kontakoj"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Konservi"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Ligilo al Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Repondo de Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datumoj estas tro granda por unuopa enmeto. Bonvole konservi protokolon al "
+"dosiero."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Sencimig-fenestro"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Sendi al Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivelo "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Sencimigo"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informo"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Averto"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritike"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Eraro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Retregiono"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorio"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivelo"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4589,179 +4503,285 @@ msgstr ""
 "La elektita kontaktadministrilo ne subtenas la kromprogramon de fora "
 "sencimigo."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Inviti partoprenonton"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Elektu kontakton por inviti al la konversacio:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Inviti"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Montri neniun dialogojn; fari laboron (ekz. importado) kaj eliri"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ne montri iun ajn dialogojn krom se estas nur kontoj de “proksima homoj”"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Unue elekti la indikitan konton (ekz. gabble/jabber/foo_40ekzemplo_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empatio-kontoj"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empatio-kontoj"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Montri specifan servon"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empatio-sencimigilo"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empatio-sencimigilo"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
-msgstr "- Babililo 'Empatio'"
+msgstr "- Babilkliento Empatio"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Respondo"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rifuzi"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Respondo"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Respondi per video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Malakcepti"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Akcepti"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Provizi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ĵus provis voki vin, sed vi jam estis en alia voko."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Atendanta"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Silentigi"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Daŭro"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Via aktuala bilanco estas %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Pardonu, via kredito ne sufiĉas por tiu voko."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Plenumi konton"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uskleca kongruo"
 
-#~ msgid "All"
-#~ msgstr "Ĉiuj"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Kian babilkonton vi havas?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Aldono de nova konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Proksimaj homoj"
+
+#: ../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."
+msgstr ""
+"Empatio povas aŭtomate eltrovi la homojn kiu konektis al la sama reto kiel "
+"vi kaj babili kun ili. Se vi volas uzi ĉi tiun trajton, bonvolu kontroli ĉu "
+"la jenaj detaloj ĝustas."
+
+#: ../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 ""
+"Vi povas facile ŝanĝi tiujn detalojn poste aŭ elŝalti tiun trajton per "
+"elekti <span style=\"italic\">Redakti → Kontoj</span> en la kontaktaro."
+
+#~ msgid "_Accept"
+#~ msgstr "_Akcepti"
 
-#~ msgid "Date"
-#~ msgstr "Dato"
+#~ msgid "Personal Information"
+#~ msgstr "Personaj informoj"
 
-#~ msgid "Conversations"
-#~ msgstr "Konversacioj"
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "R_edakti"
 
-#~ msgid "Find Next"
-#~ msgstr "Trovi la sekvan"
+#~ msgid "Birthday:"
+#~ msgstr "Naskiĝtago:"
 
-#~ msgid "Find Previous"
-#~ msgstr "Trovi la antaŭan"
+#~ msgid "Full name:"
+#~ msgstr "Tuta nomo:"
 
-#~ msgid "_For:"
-#~ msgstr "_Por:"
+#~ msgid "C_hat"
+#~ msgstr "_Babilo"
 
-#~ msgid "Save _New Status Message"
-#~ msgstr "Redakti kutimajn mesaĝoj"
+#~ msgid "_Personal Information"
+#~ msgstr "_Personaj informoj"
 
-#~ msgid "Saved Status Messages"
-#~ msgstr "Konservitaj stat-mesaĝoj"
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redakti->Kontoj"
 
-#~ msgid "Show and edit accounts"
-#~ msgstr "Montri kaj redakti kontojn"
+#~ msgid "E-mail address:"
+#~ msgstr "Retpoŝtadreso:"
 
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empatio demandis pri importi kontojn"
+#~ msgid "Phone number:"
+#~ msgstr "Telefonnumero:"
 
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr "Ĉu Empatio demandu pri enporto de kontoj de aliaj progamoj?"
+#~ msgid "Continue"
+#~ msgstr "Daŭrigi"
 
-#~ msgid "Your software is too old"
-#~ msgstr "Via programaro estas tro maljuna"
+#~ msgid "The error message was: %s"
+#~ msgstr "La erarmesaĝo estis: %s"
 
-#~ msgid "_Accept"
-#~ msgstr "_Akcepti"
+#~ msgid "An error occurred"
+#~ msgstr "Eraro aperis"
+
+#~ msgid "There was an error."
+#~ msgstr "Okazis eraro."
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, tio sufiĉas nun"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, mi volas novan konton"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokolo:"
+
+#~ msgid "No protocol installed"
+#~ msgstr "Neniu protokolo estas instalita"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empatio translokis papiliajn spurojn"
+
+#~ msgid "Website:"
+#~ msgstr "Retpaĝaro:"
+
+#~ msgid "Select a contact"
+#~ msgstr "Elekti kontakton"
+
+#~ msgid "_Link"
+#~ msgstr "_Ligi"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Malligi"
+
+#~ msgid "C_all"
+#~ msgstr "_Voki"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Bonvenon al Empatio"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Nuligi"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupite"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Ingotipo estas nesubtenata"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Malligi…"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakt-ID:"
+
+#~ msgid "Send _Video"
+#~ msgstr "Sendi _videon"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "Update software..."
-#~ msgstr "Ĝisdatigi programaron..."
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "Context"
-#~ msgstr "Kunteksto"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "%s is now offline."
-#~ msgstr "%s estas nun nekonektite."
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nekonate"
 
-#~ msgid "%s is now online."
-#~ msgstr "%s estas nun konektite."
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "Malfermi n_ovajn babilojn en propraj fenestroj"
diff --git a/po/es.po b/po/es.po
index 86072fa66..39710cb02 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2003 Free Software Foundation
 # This file is distributed under the same license as the Gossip package.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-22 11:35+0000\n"
-"PO-Revision-Date: 2011-12-23 14:51+0100\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 14:15+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,489 +20,501 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de mensajería instantánea"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensajería instantánea Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliente de mensajería instantánea"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chatee en Google Talk, Facebook, MSN y muchos otros servicios de chat"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Cuentas de mensajería y Voz IP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gestionar las cuentas de mensajería y Voz IP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
+msgid "Connection managers should be used"
+msgstr "Se deberían usar gestores de conexión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Dispositivo de cámara"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Indica si se debe usan usar gestores de conectividad para desconectarse/"
+"reconectarse automáticamente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Posición de la cámara"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy se debería autoconectar al inicio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Carácter que añadir después del apodo cuando se usa el completado de apodos "
-"(tab) en salas de chat."
+"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
+"inicio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Tema de la ventana de charla"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy debería mostrar ausencia en inactividad"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Variante del tema de la ventana de charla"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
-"(ej. «es, en, fr»)."
+"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
+"usuario está inactivo."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Carpeta de descargas predeterminada de Epiphany"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Lista compacta de contactos"
+msgid "The default folder to save file transfers in."
+msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Se deberían usar gestores de conexión"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr ""
+"Número mágico usado para comprobar si se deben ejecutar tareas de limpieza"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Criterio de ordenación de la lista de contactos"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c usa este número para comprobar si se deben "
+"ejecutar o no las tareas de limpieza. Los usuarios no deben cambiar esta "
+"clave manualmente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
-"sala."
+msgid "Show offline contacts"
+msgstr "Mostrar contactos no conectados"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
-"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
-"ej. /dev/video0."
+"Indica si se debe mostrar los contactos que están desconectados en la lista "
+"de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Carpeta predeterminada para seleccionar un avatar"
+msgid "Show avatars"
+msgstr "Mostrar avatares"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Desactivar las notificaciones emergentes al estar ausente"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Indica si se deben mostrar los avatares para los contactos en la lista de "
+"contactos y ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Desactivar los sonidos al ausentarse"
+msgid "Show protocols"
+msgstr "Mostrar protocolos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Mostrar los eventos entrantes en el área de estado"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Indica si se deben mostrar los protocolos para los contactos en la lista de "
+"contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
-"directamente al usuario."
+msgid "Show Balance in contact list"
+msgstr "Mostrar crédito en la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Soporte de cancelación de eco"
+msgid "Whether to show account balances in the contact list."
+msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy puede publicar la ubicación del usuario"
+msgid "Compact contact list"
+msgstr "Lista compacta de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy puede usar el GPS para deducir la ubicación"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
+msgid "Hide main window"
+msgstr "Ocultar la ventana principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy puede usar la red para deducir la ubicación"
+msgid "Hide the main window."
+msgstr "Ocultar la ventana principal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Carpeta de descargas predeterminada de Epiphany"
+msgid "Default directory to select an avatar image from"
+msgstr "Carpeta predeterminada para seleccionar un avatar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy debería mostrar ausencia en inactividad"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Última carpeta de la que se eligió un avatar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy se debería autoconectar al inicio"
+msgid "Open new chats in separate windows"
+msgstr "Abrir chats nuevos en ventanas separadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy debería reducir la precisión de la ubicación"
+msgid "Always open a separate chat window for new chats."
+msgstr "Siempre abrir una ventana de chat separada para chats nuevos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
+msgid "Display incoming events in the status area"
+msgstr "Mostrar los eventos entrantes en el área de estado"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Activar las herramientas de desarrollo de WebKit"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Mostrar los eventos entrantes en el área de estado. Si es falso presentarlos "
+"directamente al usuario."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Activar notificaciones emergentes para mensajes nuevos"
+msgid "The position for the chat window side pane"
+msgstr "La posición para el panel lateral de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Activar revisor ortográfico"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"La posición almacenada (en píxeles) del panel lateral de la ventana de "
+"charla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Ocultar la ventana principal"
+msgid "Show contact groups"
+msgstr "Mostrar grupos de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Ocultar la ventana principal."
+msgid "Whether to show groups in the contact list."
+msgstr "Indica si se deben mostrar los grupos en la lista de contactos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
+msgid "Contact list sort criterion"
+msgstr "Criterio de ordenación de la lista de contactos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Carácter de completado de apodo"
+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 ""
+"Qué criterio usar al ordenar la lista de contactos. El predeterminado es "
+"ordenar por el estado del contacto con el valor «state» (estado). Un valor "
+"«nombre» (nombre) ordenará la lista por el nombre."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Abrir chats nuevos en ventanas separadas"
+msgid "Use notification sounds"
+msgstr "Usar sonidos de notificación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Ruta del tema Adium que usar"
+msgid "Whether to play a sound to notify of events."
+msgstr "Indica si se debe reproducir un sonido para notificar eventos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
+msgid "Disable sounds when away"
+msgstr "Desactivar los sonidos al ausentarse"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Reproducir un sonido cuando lleguen mensajes"
+msgid "Whether to play sound notifications when away or busy."
+msgstr ""
+"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
+"ausente u ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Reproducir un sonido para conversaciones nuevas"
+msgid "Play a sound for incoming messages"
+msgstr "Reproducir un sonido cuando lleguen mensajes"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Reproducir un sonido al enviar mensajes"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un sonido cuando un contacto inicie sesión"
+msgid "Play a sound for outgoing messages"
+msgstr "Reproducir un sonido al enviar mensajes"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar mensajes salientes."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Reproducir un sonido cuando inicio sesión"
+msgid "Play a sound for new conversations"
+msgstr "Reproducir un sonido para conversaciones nuevas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Reproducir un sonido al finalizar una sesión"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproducir un sonido cuando un contacto inicie sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
+"de los contactos en la red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproducir un sonido cuando un contacto finalice su sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
+"sesión de los contactos en la red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Mostrar crédito en la lista de contactos"
+msgid "Play a sound when we log in"
+msgstr "Reproducir un sonido cuando inicio sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Mostrar avatares"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Mostrar lista de contactos en salas"
+msgid "Play a sound when we log out"
+msgstr "Reproducir un sonido al finalizar una sesión"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Mostrar contactos no conectados"
+msgid "Enable popup notifications for new messages"
+msgstr "Activar notificaciones emergentes para mensajes nuevos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Mostrar protocolos"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
+"nuevo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Idiomas para revisión ortográfica"
+msgid "Disable popup notifications when away"
+msgstr "Desactivar las notificaciones emergentes al estar ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "La carpeta predeterminada donde guardar los archivos transferidos."
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
+"ausente u ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Última carpeta de la que se eligió un avatar."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+"Mostrar notificaciones emergentes si la ventana de chat no tiene el foco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "La posición para el panel lateral de la ventana de charla"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
+"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"La posición almacenada (en píxeles) del panel lateral de la ventana de "
-"charla."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Mostrar notificaciones emergentes cuando un contacto se conecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
-"El tema que se usará para mostrar la conversación en las ventanas de chat."
+"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
+"se conecta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"La variante del tema que se usará para mostrar la conversación en las "
-"ventanas de chat."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Mostrar notificaciones emergentes cuando un contacto se desconecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Usar emoticonos gráficos"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
+"se desconecta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Usar sonidos de notificación"
+msgid "Use graphical smileys"
+msgstr "Usar emoticonos gráficos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Usar tema para salas de chat"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
+"conversaciones."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr ""
-"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
+msgid "Show contact list in rooms"
+msgstr "Mostrar lista de contactos en salas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Indica si Empathy puede usar la red telefónica móvil para deducir la "
-"ubicación."
+msgid "Chat window theme"
+msgstr "Tema de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr ""
+"El tema que se usará para mostrar la conversación en las ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Indica si Empathy debe iniciar sesión en sus cuentas automáticamente al "
-"inicio."
+msgid "Chat window theme variant"
+msgstr "Variante del tema de la ventana de charla"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"The theme variant that is used to display the conversation in chat windows."
 msgstr ""
-"Indica si Empathy debe entrar en modo de ausencia automáticamente si el "
-"usuario está inactivo."
+"La variante del tema que se usará para mostrar la conversación en las "
+"ventanas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
-"de privacidad."
+msgid "Path of the Adium theme to use"
+msgstr "Ruta del tema Adium que usar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Indica si Empathy debería usar el avatar del contacto como el icono de la "
-"ventana de chat."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Ruta al tema Adium que usar si el tema usado para el chat es Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Enable WebKit Developer Tools"
+msgstr "Activar las herramientas de desarrollo de WebKit"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica si las herramientas de desarrollo de WebKit, tales como el Inspector "
 "web, den activarse."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Indica si se debe usan usar gestores de conectividad para desconectarse/"
-"reconectarse automáticamente."
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
-"con los que quiere comprobarlo."
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a otros usuarios de cuándo les esta escribiendo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Indica si se deben convertir los emoticonos en imágenes gráficas en las "
-"conversaciones."
+"Indica si enviar los estados de chat «escribiendo» o «en pausa». No afecta al "
+"estado «ausente»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
-"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Usar tema para salas de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar los inicios de sesión "
-"de los contactos en la red."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Indica si se debe usar el tema para salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar las finalizaciones de "
-"sesión de los contactos en la red."
+msgid "Spell checking languages"
+msgstr "Idiomas para revisión ortográfica"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Indica si se debe reproducir un sonido para notificar eventos."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Lista separada por comas de idiomas que se usarán en la revisión ortográfica "
+"(ej. «es, en, fr»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar mensajes entrantes."
+msgid "Enable spell checker"
+msgstr "Activar revisor ortográfico"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
 msgstr ""
-"Indica si se debe reproducir un sonido para notificar conversaciones nuevas."
+"Indica si se deben revisar las palabras tecleadas con respecto a los idiomas "
+"con los que quiere comprobarlo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr ""
-"Indica si se debe reproducir un sonido para notificar mensajes salientes."
+msgid "Nick completed character"
+msgstr "Carácter de completado de apodo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Indica si se debe reproducir un sonido al iniciar sesión en una red."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Carácter que añadir después del apodo cuando se usa el completado de apodos "
+"(tab) en salas de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Indica si se debe reproducir un sonido al finalizar sesión en una red."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy debería usar el avatar del contacto como icono de la ventana de chat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"Indica si se deben reproducir sonidos de notificaciones cuando se esté "
-"ausente u ocupado."
+"Indica si Empathy debería usar el avatar del contacto como el icono de la "
+"ventana de chat."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
-"se desconecta."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última cuenta seleccionada en el diálogo Unirse a sala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando un contacto "
-"se conecta."
+"Ruta del objeto D-Bus de la última cuenta seleccionada para unirse a una "
+"sala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Indica si de deben mostrar notificaciones emergentes al recibir un mensaje "
-"nuevo incluso si la ventana de chat ya está abierta pero no tiene el foco."
+msgid "Camera device"
+msgstr "Dispositivo de cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Indica si se deben mostrar notificaciones emergentes al recibir un mensaje "
-"nuevo."
+"El dispositivo de cámara predeterminado que usar en las llamadas de vídeo, "
+"ej. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Indica si se debe mostrar el crédito en la lista de contactos."
+msgid "Camera position"
+msgstr "Posición de la cámara"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Indica si se deben mostrar los avatares para los contactos en la lista de "
-"contactos y ventanas de chat."
+msgid "Position the camera preview should be during a call."
+msgstr "Posición donde estar la vista previa de la cámara durante una llamada."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr ""
-"Indica si se debe mostrar los contactos que están desconectados en la lista "
-"de contactos."
+msgid "Echo cancellation support"
+msgstr "Soporte de cancelación de eco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
-"Indica si se deben mostrar las notificaciones emergentes cuando se esté "
-"ausente u ocupado."
+"Indica si se debe activar la el filtro de cancelación de eco de Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Indica si se deben mostrar los protocolos para los contactos en la lista de "
-"contactos."
+msgid "Show hint about closing the main window"
+msgstr "Mostrar consejo sobre cómo cerrar la ventana principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Indica si se debe mostrar la lista de contactos en salas de chat."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Indica si se debe mostrar la lista de contactos en modo compacto."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -510,75 +522,97 @@ msgstr ""
 "Indica si se debe mostrar un mensaje de diálogo sobre cómo cerrar la ventana "
 "principal con el botón «x» en la barra de título."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy puede publicar la ubicación del usuario"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr ""
+"Indica si Empathy puede publicar la ubicación del usuario a sus contactos."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Indica si se debe usar el tema para salas de chat."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy puede usar la red para deducir la ubicación"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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 "Whether Empathy can use the network to guess the location."
+msgstr "Indica si Empathy puede usar la red para deducir la ubicación."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy puede usar la red telefónica móvil para deducir la ubicación"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
-"Qué criterio usar al ordenar la lista de contactos. El criterio "
-"predeterminado es ordenar por el nombre del contacto con el valor "
-"«name» (nombre). Un valor «state» (estado) ordenará la lista por el estado."
+"Indica si Empathy puede usar la red telefónica móvil para deducir la "
+"ubicación."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gestionar las cuentas de mensajería y Voz IP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy puede usar el GPS para deducir la ubicación"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Cuentas de mensajería y Voz IP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Indica si Empathy puede usar el GPS para deducir la ubicación."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy debería reducir la precisión de la ubicación"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Indica si Empathy debería reducir la precisión de la ubicación por motivos "
+"de privacidad."
+
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Se requirió un cambio en el estado"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Canceló la transferencia del archivo"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "El otro participante canceló la transferencia del archivo"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Error la intentar transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "El otro participante no puede transferir el archivo"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Se completó la transferencia de archivo pero el archivo está corrupto"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "El contacto remoto no soporta la transferencia de archivos"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "El archivo seleccionado no es un archivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "El archivo seleccionado está vacío"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Llamada perdida de %s"
@@ -594,141 +628,141 @@ msgstr "Llamó %s"
 msgid "Call from %s"
 msgstr "Llamada de %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponible"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "No se especificó ninguna razón"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "El estado se ha establecido a desconectado"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Error de red"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Falló la autenticación"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Error de cifrado"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nombre en uso"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "No se proporcionó el certificado"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado sin confianza"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "El certificado ha expirado"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "El certificado no está activado"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "El nombre del equipo del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "La huella del certificado no coincide"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado firmado consigo mismo"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Error del certificado"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "El cifrado no está disponible"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "El certificado no es válido"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Se rechazó la conexión"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "No se pudo establecer la conexión"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Se perdió la conexión"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "El recurso ya está conectado al servidor"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta cuenta ya está conectada al servidor"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Se ha reemplazado la conexión por una conexión nueva usando el mismo recurso"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "La cuenta ya existe en el servidor"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr ""
 "Actualmente el servidor está demasiado ocupado para gestionar la conexión"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Se revocó el certificado"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "El certificado usa un algoritmo de cifrado inseguro o es criptográficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -737,78 +771,97 @@ msgstr ""
 "servidor de certificados exceden los límites impuestos por la biblioteca "
 "cripotográfica"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Su software es demasiado antiguo"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Error interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Gente cerca"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo Japón"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "hace %d segundo"
 msgstr[1] "hace %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "hace %d minuto"
 msgstr[1] "hace %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "hace %d hora"
 msgstr[1] "hace %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "hace %d día"
 msgstr[1] "hace %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "hace %d semana"
 msgstr[1] "hace %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "hace %d mes"
 msgstr[1] "hace %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "en el futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "No se encontró la contraseña"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Contraseña de la cuenta IM para %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Contraseña para la sala de chat «%s» en la cuenta %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Todas las cuentas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Cuenta"
 
@@ -826,30 +879,30 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Puerto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta cuenta ya existe en el servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear una cuenta nueva en el servidor"
 
@@ -858,137 +911,137 @@ msgstr "Crear una cuenta nueva en el servidor"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s en %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:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Cuenta %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Cuenta nueva"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+#: ../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:"
+msgstr "Contra_seña:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avanzadas"
+msgid "Screen _Name:"
+msgstr "_Nombre en pantalla:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Ejemplo:</b> MiNombreEnPantalla"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Contra_seña:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Recordar contraseña"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Puerto:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Recordar contraseña"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nombre en pantalla:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "¿Cuál es su contraseña de AIM?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avanzadas"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "¿Cuál es su nombre en pantalla para AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Puerto:"
+msgid "What is your AIM password?"
+msgstr "¿Cuál es su contraseña de AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Ejemplo:</b> usuario"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Recordar contraseña"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_ID de sesión:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Ejemplo:</b> usuario"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "¿Cuál es su ID de usuario para GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "¿Cuál es su contraseña de GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Ejemplo:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "C_onjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "¿Cuál es su UIN de ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "¿Cuál es su contraseña de ICQ?"
 
@@ -1025,11 +1078,23 @@ msgstr "Opciones"
 msgid "None"
 msgstr "Ninguno"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Red"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Red:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Conjunto de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1037,14 +1102,6 @@ msgstr ""
 "La mayoría de los servidores IRC no necesitan una contraseña, de tal forma "
 "que si no está seguro, no introduzca una contraseña."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Red"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Red:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Apodo:"
@@ -1061,48 +1118,20 @@ msgstr "Mensaje de salida:"
 msgid "Real name:"
 msgstr "Nombre real:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servidores"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "¿Cuál es su apodo del IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "¿Qué red de IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Ejemplo:</b> usuario@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Ejemplo:</b> usuario@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requiere ci_frado (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorar los errores de certificados SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Sobreescribir los ajustes del servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridad:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "¿Cuál es su apodo del IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Re_curso:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "¿Cuál es su usuario de Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1114,179 +1143,203 @@ msgstr ""
 "Use <a href=\"http://www.facebook.com/username/\">esta página</a> para "
 "elegir un nombre de usuario en Facebook si no tiene uno."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Usar SS_L antiguo"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "¿Cuál es su contraseña de Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "¿Cuál es su usuario de Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "¿Cuál es su ID de Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Ejemplo:</b> usuario@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "¿Cuál es su contraseña de Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Ejemplo:</b> usuario@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignorar los errores de certificados SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridad:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Re_curso:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Requiere ci_frado (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar SS_L antiguo"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Sobreescribir los ajustes del servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "¿Cuál es su ID de Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "¿Cuál es su contraseña de Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "¿Cuál es el ID de usuario que quiere para Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "¿Cuál es su contraseña de Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "¿Cuál es la contraseña que quiere para Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Ejemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "¿Cuál es su ID de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "¿Cuál es su contraseña de Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Dirección de correo-_e:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Apo_do:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "Ape_llidos:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Nombre:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nombre p_ublicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "Ape_llidos:"
+msgid "E-_mail address:"
+msgstr "Dirección de correo-_e:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nombre p_ublicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Ejemplo:</b> usuario@mi.servidor.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Usuario para la autenticación:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Descubrir vinculación"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Descubrir el servidor STUN automáticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar errores TLS"
+msgid "NAT Traversal Options"
+msgstr "Opciones de NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opciones del proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opciones de «keepalive»"
+msgid "Miscellaneous Options"
+msgstr "Opciones de miscelánea"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Enrutado impreciso"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descubrir el servidor STUN automáticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opciones de miscelánea"
+msgid "Discover Binding"
+msgstr "Descubrir vinculación"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opciones de NAT transversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opciones de «keepalive»"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Puerto:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opciones del proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Usuario para la autenticación:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Enrutado impreciso"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar errores TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar esta cuenta para llamar a te_léfonos fijos y móviles"
+msgid "Port:"
+msgstr "Puerto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "¿Cuál es la contraseña de su cuenta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "¿Cuál es su ID de inicio de sesión SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Usuario:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "¿Cuál es la contraseña de su cuenta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D de Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ignorar invitaciones a conferencias y salas de chat"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Configuración de la lista de _salas:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "¿Cuál es su ID de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "¿Cuál es su contraseña de Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D de Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Configuración de la lista de _salas:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1324,65 +1377,65 @@ msgstr "Todos los archivos"
 msgid "Click to enlarge"
 msgstr "Pulse para agrandar"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Hubo un error al iniciar la llamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "El contacto especificado no soporta llamadas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "El contacto especificado está desconectado"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "El contacto especificado no es válido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo no soporta llamadas de emergencia"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "No tiene crédito suficiente para hacer esta llamada"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Falló al abrir el chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "El tema no está soportado en esta conversación"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "No le está permitido cambiar el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "%s no es un identificador de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpiar todos los mensajes de la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: establecer el tema para la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <id de sala de chat>: unirse a una sala de chat nueva"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1390,23 +1443,23 @@ msgstr ""
 "/part [<ID de la sala de chat>] [<razón>]: abandonar la sala de chat, la "
 "actual de manera predeterminada"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <id del contacto> [<mensaje>]: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <id del contacto> <mensaje>: abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apodo>: cambiar su apodo en el servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensaje>: enviar un mensaje de ACCIÓN a la conversación actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1416,11 +1469,11 @@ msgstr ""
 "para enviar un mensaje comenzando por una «/». Por ejemplo: «/say /join se usa "
 "para unirse a una sala de chat nueva»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID del contacto>: mostrar información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1428,122 +1481,128 @@ msgstr ""
 "/help [<comando>]: mostrar todos los comandos soportados. Si <comando> está "
 "definido, muestra su uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconocido; consulte /help para ver los comandos disponibles"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "no tiene balance suficiente para enviar el mensaje"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Error al enviar el mensaje «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Error al enviar el mensaje: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "no tiene balance suficiente para enviar el mensaje. <a href='%s'>Recargar</"
 "a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "no es posible"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "contacto no válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permiso denegado"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "mensaje demasiado largo"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "no implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "El tema se ha establecido a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema establecido por %s a: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "No se ha definido el tema"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Sin sugerencias)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Añadir «%s» al diccionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Añadir «%s» al diccionario de «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "E_nviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Sugerencias ortográficas"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Falló al recibir los registros recientes"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s se ha desconectado"
@@ -1551,12 +1610,12 @@ msgstr "%s se ha desconectado"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s expulsó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s fue expulsado"
@@ -1564,17 +1623,17 @@ msgstr "%s fue expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s vetó a %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s fue vetado"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ha dejado la sala"
@@ -1584,17 +1643,17 @@ msgstr "%s ha dejado la sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ha entrado en la sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Ahora %s se llama %s"
@@ -1602,55 +1661,55 @@ msgstr "Ahora %s se llama %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "¿Quiere guardar esta contraseña?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Recordar"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ahora no"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Volver a intentarlo"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Contraseña incorrecta; inténtelo de nuevo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protegida por contraseña:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversación"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1682,10 +1741,10 @@ msgstr "Editar contactos bloqueados"
 #. 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:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Cuenta:"
 
@@ -1695,7 +1754,7 @@ msgstr "Contactos bloqueados"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Quitar"
@@ -1718,34 +1777,30 @@ msgstr "_Abrir enlace"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Información personal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto nuevo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "¿Bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 ""
 "¿Está seguro de que quiere bloquear a «%s» para que no le vuelva a contactar?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1753,17 +1808,17 @@ msgstr[0] "Info_rmar de este contacto como abusivo"
 msgstr[1] "Info_rmar de estos contacto como abusivos"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir _luego"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Petición de suscripción"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloquear usuario"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir _luego"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1918,7 +1973,7 @@ msgstr "Altitud:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Ubicación geográfica"
 
@@ -1935,15 +1990,25 @@ msgid "%B %e, %Y at %R UTC"
 msgstr "%e de %B de %Y a las %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Guardar avatar"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "No se pudo guardar el avatar"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles personales"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles del contacto"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nombre completo"
@@ -2009,54 +2074,49 @@ msgstr "postal"
 msgid "parcel"
 msgstr "grupo"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Ubicación</b> en (fecha)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identificador:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Apodo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Información del cliente"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Ubicación</b> en (fecha)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Detalles del contacto"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Información solicitadas"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Identificador:"
+msgid "Client Information"
+msgstr "Información del cliente"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Información solicitadas"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versión:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2064,17 +2124,17 @@ msgstr ""
 "Seleccione los grupos en los que quiere que este contacto aparezca, Note que "
 "puede seleccionar más de un grupo o ningún grupo."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Añadir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
@@ -2094,158 +2154,140 @@ msgstr[1] "No se pueden bloquear la siguientes identidades:"
 msgid "Edit Contact Information"
 msgstr "Editar información del contacto"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contactos enlazados"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Seleccionar contactos para enlazar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Vista previa del contacto nuevo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Se enlazarán entre sí los contactos seleccionados en la lista de la "
-"izquierda."
-
 #. 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:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccionar la cuenta que usar para realizar la llamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Llamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móvil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Chat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Conversaciones an_teriores"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Compartir mi escritorio"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts no está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instale gnome-contacts para acceder a los detalles de los contactos."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Enlazar contactos…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Invitándolo a esta sala"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Invitar a sala de chat"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Añadir contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Eliminar y _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "¿Realmente quiere quitar el grupo «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 msgid "Removing group"
 msgstr "Quitando grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2474
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "¿Realmente quiere quitar el contacto «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2254,11 +2296,11 @@ msgstr ""
 "¿Realmente quiere quitar el contacto enlazado «%s»? Tenga en cuenta que esto "
 "quitará todos los contactos que componen este contacto enlazado."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2495
 msgid "Removing contact"
 msgstr "Quitando el contacto"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2269,23 +2311,23 @@ msgstr[1] "Contacto enlazado que contiene %u contactos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Ubicación</b> en (fecha)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado desde un teléfono o un dispositivo móvil"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Red nueva"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Elegir una red IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Rei_niciar lista de redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleccionar"
@@ -2298,222 +2340,177 @@ msgstr "servidor nuevo"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Enlazar contactos"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desenlazar…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Separar completamente los contactos enlazados mostrados en contactos "
-"separados."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Enlazar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "¿Desenlazar los contactos enlazados «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"¿Está seguro de querer desenlazar estos contactos enlazados? Esto separará "
-"completamente los contactos enlazados en contactos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desenlazar"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Chatee en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Chat con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y a las %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "La llamada duró %s, finalizó a las %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hoy"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Cualquier hora"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Cualquiera"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Quién"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Cuándo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Cualquier cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Chats de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Llamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Llamadas entrantes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Llamadas salientes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Llamadas perdidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Qué"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "¿Está seguro de que quiere eliminar todos los registros de conversaciones "
 "anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Eliminar de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Cargando…</span>"
+msgid "_File"
+msgstr "_Archivo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chat"
+#: ../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 "_Editar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Borrar todo el histórico…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chat"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Vídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Archivo"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "página 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Cargando…</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "El contacto está desconectado"
@@ -2559,7 +2556,7 @@ msgid "There was an error starting the conversation"
 msgstr "Hubo un error al iniciar la conversación"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Introduzca el identificador de un contacto o un número de teléfono:"
 
@@ -2569,17 +2566,17 @@ msgid "New Conversation"
 msgstr "Conversación nueva"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "Llamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "Llamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Llamada nueva"
 
@@ -2635,7 +2632,7 @@ msgstr "Mensajes personalizados…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Cuenta de %s nueva"
@@ -2645,20 +2642,20 @@ msgid "Find:"
 msgstr "Buscar:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Coincidir con capitalización"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "No se encontró la frase"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Siguiente"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Coincidir con capitalización"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "Phrase not found"
+msgstr "No se encontró la frase"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2704,12 +2701,12 @@ msgstr "Finalizó la llamada de voz"
 msgid "Edit Custom Messages"
 msgstr "Editar mensajes personalizados"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaje editado a las %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2788,34 +2785,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nombre del servidor de certificados: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "La conexión no es de confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Esta conexión no es de confianza. ¿Quiere continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Recordar esta opción para futuras conexiones"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles del certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "No se pudo abrir el URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Seleccionar un archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "No hay espacio suficiente para guardar el archivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2824,7 +2825,7 @@ msgstr ""
 "Se requiere %s de espacio libre para guardar este archivo, pero sólo hay %s "
 "disponible. Elija otra ubicación."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Archivo entrante de %s"
@@ -3004,23 +3005,23 @@ msgstr "Sin mensaje de eeror"
 msgid "Instant Message (Empathy)"
 msgstr "Mensaje instantáneo (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "No conectarse automáticamente al inicio"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "No mostrar la lista de contactos o cualquier otro diálogo al inicio"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensajería instantánea Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Error al contactar con el Gestor de cuentas"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3077,233 +3078,83 @@ msgstr ""
 "Jorge González <jorgegonz@svn.gnome.org>, 2007-2010\n"
 "Daniel Mustieles <daniel.mustieles@gmail.com>, 2010"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Hubo un error al importar las cuentas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Hubo un error al analizar los detalles de la cuenta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Hubo un error al crear la cuenta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Hubo un error."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "El mensaje de error fue: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Puede volver atrás e intentar introducir los detalles de su cuenta de nuevo "
-"o salir de este asistente y añadir cuentas posteriormente desde el menú "
-"Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Ocurrió un error"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "¿Qué tipo de cuenta tiene?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Introducir los detalles de su cuenta"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "¿Qué tipo de cuenta quiere crear?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "¿Quiere crear otras cuentas de chat?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Introducir los detalles para la cuenta nueva"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
-"Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
-"micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Sí, importar los detalles de mi cuenta desde "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Sí, introduciré ahora los detalles de mi cuenta"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "No, quiero crear una cuenta nueva"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Seleccione las cuentas que quiere importar:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Sí"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "No, eso es todo por ahora"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy puede descubrir automáticamente las personas conectadas en su misma "
-"red para poder chatear con ellas. Si quiere usar esta característica "
-"compruebe que los detalles de abajo son correctos. Puede cambiar fácilmente "
-"estos detalles posteriormente o desactivar esta característica usando el "
-"diálogo «Cuentas»."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Editar->Cuentas"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_No quiero activar esta característica por ahora"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"No podrá chatear con las personas conectadas en su red local, ya que "
-"telepathy-salut no está instalado. Si quiere activar esta característica "
-"instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde el "
-"diálogo Cuentas."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut no está instalado"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistente de cuentas de mensajería y Voz IP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Bienvenido a Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importar sus cuentas existentes"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Introduzca los detalles personales"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Existen modificaciones sin guardar en su cuenta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Aún no se ha guardado su cuenta nueva."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado: %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Desconectado: sin conexión de red"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Esta cuenta se ha desactivado porque se basa en un «backend» antiguo no "
+"soportado. Instale telepathy-haze y reinicie la sesión para migrar esta "
+"cuenta."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Desconectado: cuenta desactivada"
 
-#: ../src/empathy-accounts-dialog.c:538
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Editar los parámetros de la conexión"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Falló al recuperar su información personal del servidor."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar su información personal."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar los parámetros de la conexión…"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "¿Quiere quitar %s de su equipo?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Esto no quitará su cuenta del servidor."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3312,15 +3163,23 @@ msgstr ""
 "¿Seguro que quiere continuar?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Omitir"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3332,19 +3191,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Añadir…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Cargando información de la cuenta"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "No hay protocolos instalados"
+msgid "_Import…"
+msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Cargando información de la cuenta"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3352,120 +3207,116 @@ msgstr ""
 "Para añadir una nueva cuenta debe instalar primero un «backend» para cada "
 "protocolo que quiera usar."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importar…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "No hay «backends» de protocolos instalados"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr ": Cliente de autenticación de Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación de Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Gente cerca"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr ": Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de sonido/vídeo Empathy"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volumen"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Entrada de voz"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Teclado de llamada"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detalles"
 
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Llamada con %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "La dirección IP como la ve la máquina"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "La dirección IP como la ve el servidor de Internet"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "La dirección IP del par como la ve la otra parte"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "La dirección IP de un servidor de desvío"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "La dirección IP del grupo multicast"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../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
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Desconocido"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3474,8 +3325,8 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3484,8 +3335,8 @@ msgstr ""
 "El software de «%s» no entiende ninguno de los formatos de vídeo soportados "
 "por su equipo"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3494,29 +3345,29 @@ msgstr ""
 "No se puede establecer una conexión con %s. Uno de los dos puede estar en "
 "una red que no acepta conexiones directas."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Hubo un fallo en la red"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "No están instalados en su equipo los formatos de sonido necesarios para esta "
 "llamada"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "No están instalados en su equipo los formatos de vídeo necesarios para esta "
 "llamada"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3527,262 +3378,309 @@ msgstr ""
 "\">Informe de este error</a> y añada los registros obtenidos de la ventana "
 "de «Depuración» en el menú de Ayuda."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Hubo un fallo en el motor de llamadas"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Se llegó al final del flujo"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "No se puede establecer el flujo de voz"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "No se puede establecer el flujo de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Sonido"
+msgid "_Call"
+msgstr "_Llamar"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Códec de decodificación:"
+msgid "_Microphone"
+msgstr "_Micrófono"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Desactivar cámara"
+msgid "_Camera"
+msgstr "_Cámara"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Mostrar el teclado de llamada"
+msgid "_Settings"
+msgstr "_Configuración"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Códec de codificación:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Colgar"
+#: ../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 "Ay_uda"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Colgar la llamada actual"
+#: ../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 "Índ_ice"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Candidato local:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Depurar"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximizarme"
+msgid "Swap camera"
+msgstr "Intercambiar cámara"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizarme"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Candidato remoto:"
+msgid "Maximise me"
+msgstr "Maximizarme"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar voz"
+msgid "Disable camera"
+msgstr "Desactivar cámara"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Colgar"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Mostrar teclado de llamada"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Colgar la llamada actual"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Llamada de vídeo"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Iniciar una llamada de vídeo"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Iniciar una llamada de voz"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Intercambiar cámara"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Conmutar la transmisión de voz"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Conmutar la transmisión de vídeo"
+msgid "Show dialpad"
+msgstr "Mostrar teclado de llamada"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Desconocido"
+msgid "Display the dialpad"
+msgstr "Mostrar el teclado de llamada"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Enviar vídeo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Llamada de vídeo"
+msgid "Toggle video transmission"
+msgstr "Conmutar la transmisión de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Llamar"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Enviar voz"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Cámara"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "Índ_ice"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Conmutar la transmisión de voz"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Depurar"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Códec de codificación:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Ay_uda"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Códec de decodificación:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Micrófono"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Candidato remoto:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Configuración"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Audio"
+msgstr "Sonido"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "¿Cerrar esta ventana?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Cerrar esta ventana hará que abandone %s. No recibirá más mensajes hasta que "
+"se una de nuevo."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Cerrar esta ventana hará que abandone una sala de chat. No recibirá más "
+"mensajes hasta que se una de nuevo."
+msgstr[1] ""
+"Cerrar esta ventana hará que abandone %u salas de chat. No recibirá más "
+"mensajes hasta que se una a ellas de nuevo."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "¿Cerrar %s?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "No recibirá más mensajes de este chat hasta que se una de nuevo."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Cerrar la ventana"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Abandonar la sala"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d sin leer)"
 msgstr[1] "%s (%d sin leer)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (y otra)"
 msgstr[1] "%s (y otras %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d sin leer de otros)"
 msgstr[1] "%s (%d sin leer de otros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d sin leer de todos)"
 msgstr[1] "%s (%d sin leer de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Enviando %d mensaje"
 msgstr[1] "Enviando %d mensajes"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Tecleando un mensaje."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Limpiar"
+msgid "_Conversation"
+msgstr "_Conversación"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontacto"
+msgid "C_lear"
+msgstr "_Limpiar"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Insertar _emoticono"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Sala de chat _favorita"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Invitar pa_rticipante…"
+msgid "Notify for All Messages"
+msgstr "Notificar para todos los mensajes"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Mover pestaña a la _izquierda"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contactos"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover pestaña a la _derecha"
+msgid "Invite _Participant…"
+msgstr "Invitar pa_rticipante…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar para todos los mensajes"
+msgid "C_ontact"
+msgstr "C_ontacto"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversación"
+msgid "_Tabs"
+msgstr "_Pestañas"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Desacoplar pestaña"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Sala de chat _favorita"
+msgid "_Previous Tab"
+msgstr "Pestaña _anterior"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "Pestaña _siguiente"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Pestaña _anterior"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Deshacer cerrar pestaña"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contactos"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover pestaña a la _izquierda"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Pestañas"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover pestaña a la _derecha"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Deshacer cerrar pestaña"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Desacoplar pestaña"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3796,100 +3694,100 @@ msgstr "Sala"
 msgid "Auto-Connect"
 msgstr "Autoconectar"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Gestionar salas favoritas"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Llamada de vídeo entrante"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s le está llamando con vídeo. ¿Quiere responder?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s le está llamando. ¿Quiere responder?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "Llamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "Re_spuesta"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Llamada de vídeo entrante de %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Invitación a una sala"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitación para unirse a %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s le está invitando a unirse a %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Rechazar"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s le ha invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Le han invitado a unirse a %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de archivo entrante de %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Se requiere una contraseña"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s quiere permiso para ver cuándo está en línea"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -4011,7 +3909,11 @@ msgstr ""
 "Eliminar transferencias de archivo completadas, canceladas y fallidas de la "
 "lista"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4019,170 +3921,185 @@ msgstr ""
 "No se pudo encontrar ninguna cuenta que importar. Actualmente Empathy sólo "
 "soporta importar cuentas desde Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar cuentas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Origen"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba su contraseña"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar una cuenta para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "No se encontró ninguna coincidencia"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "Las cuentas de %s no se pueden usar hasta que no se haya actualizado su "
 "software de %s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-main-window.c:817 ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Cerrar"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar cuenta"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar el saldo de la cuenta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar una de sus cuentas para ver contactos aquí."
+
+#. 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 "Debe activar %s para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contactos en el _mapa"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configuración de la cuenta"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Crédito"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Conversación _nueva…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Buscar en la lista de contactos"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "_Llamada nueva…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Unirse a _favoritas"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Buscar contactos…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Gestionar favoritos"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Transferencias de archivos"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamaño n_ormal"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Contactos _desconectados"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "_Llamada nueva…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Mostrar p_rotocolos"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamaño normal con _avatares"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Crédito"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contactos en el _mapa"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Cuentas"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contactos _bloqueados"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "Prefere_ncias"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Mostrar p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Buscar en la lista de contactos"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nombre"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Cuentas"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Tamaño normal con _avatares"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contactos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Tamaño n_ormal"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Tamaño _compacto"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Transferencias de archivos"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Sala"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Conversación _nueva…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Contactos _desconectados"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Información p_ersonal"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Sala"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Unirse a _favoritas"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Buscar contactos…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Gestionar favoritos"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4194,7 +4111,7 @@ msgstr "Miembros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4207,22 +4124,27 @@ msgstr ""
 "Se necesita contraseña: %s\n"
 "Miembros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sí"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "No se pudo iniciar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "No se pudo parar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "No se pudo cargar la lista de la sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Unirse a sala"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4232,6 +4154,10 @@ msgstr ""
 "la lista."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Sala:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4239,18 +4165,14 @@ msgstr ""
 "Introduzca el servidor que aloja la sala o déjelo vacío si la sala está en "
 "la cuenta del servidor actual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Unirse a sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "No se pudo cargar la lista de la sala"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Sala:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensaje recibido"
@@ -4264,7 +4186,7 @@ msgid "New conversation"
 msgstr "Conversación nueva"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "El contacto se conecta"
 
 #: ../src/empathy-preferences.c:170
@@ -4284,325 +4206,356 @@ msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "¡Oh, Romeo, Romeo!, ¿dónde estás que no te veo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Niega a tu padre y rehúsa tu nombre;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "O, si no quieres, júrame tan sólo que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Y dejaré yo de ser una Capuleto"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "¿Debo oír más o contestar a lo dicho?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta se ha desconectado"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Mostrar los _emoticonos como imágenes"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Mostrar _lista de contactos en salas"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Apariencia"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Comportamiento"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Iniciar chats en:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema del chat:"
+msgid "new ta_bs"
+msgstr "pestañas nue_vas"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
+msgid "new _windows"
+msgstr "v_entanas nuevas"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Mostrar los eventos entrantes en el área de notificación"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "C_onectarse automáticamente al inicio"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
-"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
-"persona oyen ruidos o tienen problemas durante las llamadas, intente "
-"desactivar la cancelación de eco y reiniciar la llamada."
+msgid "Log conversations"
+msgstr "Registrar conversaciones"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Activar notificaciones cuando un contacto se conecta"
+msgid "Behavior"
+msgstr "Comportamiento"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Activar notificaciones cuando un contacto se desconecta"
+msgid "General"
+msgstr "General"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Activar notificaciones cuando el _chat no tenga el foco"
+msgid "_Enable bubble notifications"
+msgstr "_Activar notificaciones de burbuja"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Activar la revisión ortográfica para idiomas:"
+msgid "Disable notifications when _away or busy"
+msgstr "Desactivar notificaciones al _ausentarse o estar ocupado"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "General"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Activar notificaciones cuando el _chat no tenga el foco"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Activar notificaciones cuando un contacto se conecta"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Orígenes de las ubicaciones:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Activar notificaciones cuando un contacto se desconecta"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Registrar conversaciones"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notificaciones"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Activar notificaciones de sonido"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Reproducir sonido para eventos"
+msgid "Disable sounds when _away or busy"
+msgstr "Desactivar sonidos al _ausentarse o estar ocupado"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Privacidad"
+msgid "Play sound for events"
+msgstr "Reproducir sonido para eventos"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Reducir la precisión de la ubicación significa que no se publicará nada más "
-"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
-"aleatorio añadido 1 lugar decimal."
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Mostrar los _emoticonos como imágenes"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Mostrar _lista de contactos en salas"
-
-#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Revisión ortográfica"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelación de _eco para mejorar la calidad de las llamadas"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
-"diccionario instalado."
+"La cancelación de eco le ayuda a que la otra persona oiga su voz de forma "
+"más clara pero puede causar problemas en algunos equipos. Si usted o la otra "
+"persona oyen ruidos o tienen problemas durante las llamadas, intente "
+"desactivar la cancelación de eco y reiniciar la llamada."
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Temas"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publicar mi ubicación a mis contactos"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Usar cancelación de _eco para mejorar la calidad de las llamadas"
+#: ../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 ""
+"Reducir la precisión de la ubicación significa que no se publicará nada más "
+"preciso que su ciudad, estado y país. Las coordenadas GPS tendrán un valor "
+"aleatorio añadido 1 lugar decimal."
 
+#. 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 "Variant:"
-msgstr "Variante:"
+msgid "_Reduce location accuracy"
+msgstr "_Reducir la precisión de la ubicación"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "C_onectarse automáticamente al inicio"
+msgid "Privacy"
+msgstr "Privacidad"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "Teléfono _móvil"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Activar notificaciones de burbuja"
+msgid "_Cellphone"
+msgstr "Teléfono _móvil"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Activar notificaciones de sonido"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Red (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Orígenes de las ubicaciones:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Abrir charlas nuevas en ventanas separadas"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"La lista de idiomas refleja sólo los idiomas para los cuales tiene un "
+"diccionario instalado."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publicar mi ubicación a mis contactos"
+msgid "Enable spell checking for languages:"
+msgstr "Activar la revisión ortográfica para idiomas:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Revisión ortográfica"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "_Reducir la precisión de la ubicación"
+msgid "Chat Th_eme:"
+msgstr "_Tema del chat:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variante:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Temas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Llamar de nuevo al contacto"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Cámara apagada"
+msgid "Redial"
+msgstr "Volver a llamar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Cámara encendida"
+msgid "V_ideo"
+msgstr "Ví_deo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo apagado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desactivar la cámara y dejar de enviar vídeo"
+msgid "Video Preview"
+msgstr "Vista preliminar del vídeo"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Activar la cámara y enviar vídeo"
+msgid "Video On"
+msgstr "Vídeo encendido"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Activar la cámara pero no enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Llamar de nuevo al contacto"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Vista previa"
+msgid "Camera Off"
+msgstr "Cámara apagada"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Volver a llamar"
+msgid "Disable camera and stop sending video"
+msgstr "Desactivar la cámara y dejar de enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Ví_deo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Vista previa"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo apagado"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Activar la cámara pero no enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo encendido"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Cámara encendida"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Vista preliminar del vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Activar la cámara y enviar vídeo"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Vista del mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Guardar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Enlace a pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Respuesta de pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datos demasiado largos para un pegado sencillo. Guarde el registro en un "
+"archivo."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Depurar ventana"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Enviar a pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivel "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mensaje"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Error"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4610,48 +4563,44 @@ msgstr ""
 "El gestor de conexiones seleccionado no soporta la extensión de depuración "
 "remota."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Invitar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Elegir un contacto para invitar a la conversación:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "No mostrar ningún diálogo; realizar cualquier trabajo (ej. importar) y salir"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "No mostrar ningún diálogo a no ser que sólo existan cuentas «Gente cerca»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Cuenta proporcionada inicialmente seleccionada (ej. gabble/jabber/ejemplo)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id-de-cuenta>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Mostrar el asistente de cuentas"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr ": Cuentas en Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Cuentas en Empathy"
 
@@ -4667,85 +4616,85 @@ msgstr "- Depurador de Empathy"
 msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr ": Cliente de chat Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Respuesta"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rechazar"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Rechazar"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Aceptar"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Proporcionar"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s intentó llamarle, pero estaba en otra llamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "Información"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duración"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s: %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "su balance actual es %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "No tiene crédito suficiente para hacer esta llamada."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -4753,11 +4702,204 @@ msgstr "Recargar"
 msgid "_Match case"
 msgstr "_Coincidir con capitalización"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "¿Qué tipo de cuenta tiene?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
 msgid "Adding new account"
 msgstr "Añadiendo cuenta nueva"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Gente cerca"
+
+#: ../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."
+msgstr ""
+"Empathy puede descubrir automáticamente las personas conectadas en su misma "
+"red para poder chatear con ellas. Si quiere usar esta característica "
+"compruebe que los detalles de abajo son correctos."
+
+#: ../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 ""
+" Puede cambiar fácilmente estos detalles posteriormente o desactivar esta "
+"característica eligiendo <span style=\"italic\">Editar → Cuentas</span> en "
+"la lista de contactos."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Hubo un error al importar las cuentas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Hubo un error al analizar los detalles de la cuenta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Hubo un error al crear la cuenta."
+
+#~ msgid "There was an error."
+#~ msgstr "Hubo un error."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "El mensaje de error fue: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Puede volver atrás e intentar introducir los detalles de su cuenta de "
+#~ "nuevo o salir de este asistente y añadir cuentas posteriormente desde el "
+#~ "menú Editar."
+
+#~ msgid "An error occurred"
+#~ msgstr "Ocurrió un error"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "¿Tiene otras cuentas de chat que quiera configurar?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Introducir los detalles de su cuenta"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "¿Qué tipo de cuenta quiere crear?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "¿Quiere crear otras cuentas de chat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Introducir los detalles para la cuenta nueva"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy puede charlar con gente cerca y con amigos y colegas que usen "
+#~ "Google Talk, AIM, Windows Live y muchos otros programas de chat. Con un "
+#~ "micrófono o una cámara web puede hacer incluso llamadas de voz o vídeo."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "¿Tiene una cuenta que haya estado usando con otro programa de chat?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sí, importar los detalles de mi cuenta desde "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sí, introduciré ahora los detalles de mi cuenta"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, quiero crear una cuenta nueva"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, por ahora sólo quiero ver la gente conectada cerca"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Seleccione las cuentas que quiere importar:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, eso es todo por ahora"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editar->Cuentas"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_No quiero activar esta característica por ahora"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "No podrá chatear con las personas conectadas en su red local, ya que "
+#~ "telepathy-salut no está instalado. Si quiere activar esta característica "
+#~ "instale el paquete telepathy-salut y cree una cuenta de Gente cerca desde "
+#~ "el diálogo Cuentas."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut no está instalado"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistente de cuentas de mensajería y Voz IP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Bienvenido a Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importar sus cuentas existentes"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Introduzca los detalles personales"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Mostrar el asistente de cuentas"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocolo:"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccionar contactos para enlazar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa del contacto nuevo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Se enlazarán entre sí los contactos seleccionados en la lista de la "
+#~ "izquierda."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Enlazar contactos…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Enlazar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desenlazar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Separar completamente los contactos enlazados mostrados en contactos "
+#~ "separados."
+
+#~ msgid "_Link"
+#~ msgstr "_Enlazar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "¿Desenlazar los contactos enlazados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "¿Está seguro de querer desenlazar estos contactos enlazados? Esto "
+#~ "separará completamente los contactos enlazados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desenlazar"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos enlazados"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Abrir charlas nuevas en ventanas separadas"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información personal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información p_ersonal"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "El tipo de socket no está soportado"
 
@@ -5058,9 +5200,6 @@ msgstr "Añadiendo cuenta nueva"
 #~ "Se le ha ofrecido una invitación para el servicio %s pero no tiene la "
 #~ "aplicación necesaria para manejarla"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "Desconexión solicitada por el usuario"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>Ubicación</b>"
 
diff --git a/po/et.po b/po/et.po
index c27a1c552..5a1aec689 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,83 +11,128 @@ msgstr ""
 "Project-Id-Version: empathy MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-12-31 12:40+0000\n"
-"PO-Revision-Date: 2012-01-02 01:22+0200\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 13:52+0200\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Poedit-Language: Estonian\n"
 "X-Poedit-Country: ESTONIA\n"
 
+msgid "Empathy"
+msgstr "Empathy"
+
+msgid "IM Client"
+msgstr "Välksõnumiklient"
+
+msgid "Empathy Internet Messaging"
+msgstr "Empathy interneti sõnumivahetus"
+
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr ""
 "Vestlus Google Talki, Facebooki, MSN-i ja paljude teiste vestlusteenuste "
 "kaudu"
 
-msgid "Empathy"
-msgstr "Empathy"
+#. Tweak the dialog
+msgid "Messaging and VoIP Accounts"
+msgstr "Sõnumi- ja VoIP kontod"
 
-msgid "Empathy Internet Messaging"
-msgstr "Empathy interneti sõnumivahetus"
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Sõnumi- ja VoIP kontode haldamine"
 
-msgid "IM Client"
-msgstr "Välksõnumiklient"
+msgid "Connection managers should be used"
+msgstr "Kas peab ühenduste haldureid kasutama"
 
-msgid "Always open a separate chat window for new chats."
-msgstr "Uutele vestlustele avatakse alati eraldi aken."
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
+"haldurit või mitte."
 
-msgid "Camera device"
-msgstr "Kaameraseade"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy peaks käivitumisel ise ühenduma"
 
-msgid "Camera position"
-msgstr "Kaamera asukoht"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
+
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama"
 
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
-"automaatlõpetust (tab-klahv)."
+"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku."
 
-msgid "Chat window theme"
-msgstr "Jututoaakende teema"
+msgid "Empathy default download folder"
+msgstr "Empathy vaikimisi allalaadimiste kataloog"
 
-msgid "Chat window theme variant"
-msgstr "Jututoaakende teema"
+msgid "The default folder to save file transfers in."
+msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
+
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Maagiline number, mis näitab, kas andmeid tuleks korrastada"
 
 msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+"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."
 msgstr ""
-"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")."
+"empathy-sanity-cleaning.c kasutab seda numbrit, et veenduda, kas "
+"puhastusülesanded tuleks käivitada või mitte. Kasutajad ei peaks seda "
+"väärtust käsitsi muutma."
+
+msgid "Show offline contacts"
+msgstr "Ühendamata sõpru näidatakse"
+
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
+
+msgid "Show avatars"
+msgstr "Näidatakse avatare"
+
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
+
+msgid "Show protocols"
+msgstr "Kuva protokolle"
+
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle."
+
+msgid "Show Balance in contact list"
+msgstr "Kontaktide nimekirjas näidatakse kontojääki"
+
+msgid "Whether to show account balances in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas kontojääki."
 
 msgid "Compact contact list"
 msgstr "Kompaktne sõbranimekiri"
 
-msgid "Connection managers should be used"
-msgstr "Kas peab ühenduste haldureid kasutama"
-
-msgid "Contact list sort criterion"
-msgstr "Kontaktide nimekirja sortimise alus"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
 
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht"
+msgid "Hide main window"
+msgstr "Peida peaaken"
 
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0"
+msgid "Hide the main window."
+msgstr "Peaakna peitmine."
 
 msgid "Default directory to select an avatar image from"
 msgstr "Vaikimisi kataloog, millest valida avatari pilti"
 
-msgid "Disable popup notifications when away"
-msgstr "Eemalolekul on hüpikmärguanded keelatud"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Kataloog, kust viimati valiti avatari pilt."
 
-msgid "Disable sounds when away"
-msgstr "Heliteated on minu eemaloleku korral keelatud"
+msgid "Open new chats in separate windows"
+msgstr "Uued jututoad avatakse eraldi akendes"
+
+msgid "Always open a separate chat window for new chats."
+msgstr "Uutele vestlustele avatakse alati eraldi aken."
 
 msgid "Display incoming events in the status area"
 msgstr "Sündmuste kuvamine teatealal"
@@ -99,288 +144,270 @@ msgstr ""
 "Saabuvate sündmuste kuvamine teatealal. Kui väär, näidatakse neid kasutajale "
 "otse."
 
-msgid "Echo cancellation support"
-msgstr "Kaja vähendamise tugi"
-
-msgid "Empathy can publish the user's location"
-msgstr "Empathy tohib näidata kasutaja asukohta"
-
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
-
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
-
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
-
-msgid "Empathy default download folder"
-msgstr "Empathy vaikimisi allalaadimiste kataloog"
-
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy peaks jõudeoleku korral automaatselt eemaloleku määrama"
-
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy peaks käivitumisel ise ühenduma"
+msgid "The position for the chat window side pane"
+msgstr "Vestlusakna külgpaneeli asukoht"
 
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy peaks vähendama asukoha täpsust"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Vestlusakna külgpaneeli asukoht (pikslites)."
 
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
+msgid "Show contact groups"
+msgstr "Kontaktide gruppide kuvamine"
 
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit Developer tööriistade lubamine"
+msgid "Whether to show groups in the contact list."
+msgstr "Kas näidata kontaktide nimekirjas gruppe."
 
-msgid "Enable popup notifications for new messages"
-msgstr "Uute sõnumite hüpikmärguanded on lubatud"
+msgid "Contact list sort criterion"
+msgstr "Kontaktide nimekirja sortimise alus"
 
-msgid "Enable spell checker"
-msgstr "Õigekirjakontrolli lubamine"
+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 ""
+"Kontaktide nimekirja sortimise alus. Vaikimisi väärtus on \"state\", sel "
+"juhul sorditakse kontaktid oleku järgi. Väärtuse \"name\" korral toimub "
+"sortimine nime järgi."
 
-msgid "Hide main window"
-msgstr "Peida peaaken"
+msgid "Use notification sounds"
+msgstr "Teatehelisid esitatakse"
 
-msgid "Hide the main window."
-msgstr "Peaakna peitmine."
+msgid "Whether to play a sound to notify of events."
+msgstr "Kas esitada heli sündmustest märkuandmiseks."
 
-msgid "Last account selected in Join Room dialog"
-msgstr "Viimane konto, mis valiti \"Ühine jututoaga\" dialoogis"
+msgid "Disable sounds when away"
+msgstr "Heliteated on minu eemaloleku korral keelatud"
 
-msgid "Nick completed character"
-msgstr "Nimele lisamise märk"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
 
-msgid "Open new chats in separate windows"
-msgstr "Uued jututoad avatakse eraldi akendes"
+msgid "Play a sound for incoming messages"
+msgstr "Sissetulevate sõnumite puhul esitatakse heli"
 
-msgid "Path of the Adium theme to use"
-msgstr "Kasutatava Adiumi kujunduse asukoht"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
 
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium."
+msgid "Play a sound for outgoing messages"
+msgstr "Väljuvate sõnumite puhul esitatakse heli"
 
-msgid "Play a sound for incoming messages"
-msgstr "Sissetulevate sõnumite puhul esitatakse heli"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
 
 msgid "Play a sound for new conversations"
 msgstr "Uute vestluste puhul esitatakse heli"
 
-msgid "Play a sound for outgoing messages"
-msgstr "Väljuvate sõnumite puhul esitatakse heli"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
 
 msgid "Play a sound when a contact logs in"
 msgstr "Kontakti sisenemise puhul esitatakse heli"
 
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
+
 msgid "Play a sound when a contact logs out"
 msgstr "Kontakti väljumise puhul esitatakse heli"
 
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
+
 msgid "Play a sound when we log in"
 msgstr "Heli esitamine sisselogimisel"
 
+msgid "Whether to play a sound when logging into a network."
+msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
+
 msgid "Play a sound when we log out"
 msgstr "Heli esitamine väljalogimisel"
 
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
+
+msgid "Enable popup notifications for new messages"
+msgstr "Uute sõnumite hüpikmärguanded on lubatud"
+
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
+
+msgid "Disable popup notifications when away"
+msgstr "Eemalolekul on hüpikmärguanded keelatud"
+
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Kas näidata hüpikteateid olles eemal või hõivatud."
+
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Kui vestlus pole aktiivne, näidatakse hüpikteateid"
 
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
+"vestlus on juba avatud, kuid mitte fookuses."
+
 msgid "Pop up notifications when a contact logs in"
 msgstr "Kui kontakt siseneb, kuvatakse hüpikteade"
 
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
+
 msgid "Pop up notifications when a contact logs out"
 msgstr "Kui kontakt väljub, kuvatakse hüpikteade"
 
-msgid "Position the camera preview should be during a call."
-msgstr "Enda kaamera pildi asukoht kõne ajal."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
 
-msgid "Show Balance in contact list"
-msgstr "Kontaktide nimekirjas näidatakse kontojääki"
+msgid "Use graphical smileys"
+msgstr "Tujunägudele kasutatakse pilte"
 
-msgid "Show avatars"
-msgstr "Näidatakse avatare"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks."
 
 msgid "Show contact list in rooms"
 msgstr "Jututubades näidatakse liikmete loendit"
 
-msgid "Show hint about closing the main window"
-msgstr "Peaakna sulgemise kohta näidatakse soovitust"
-
-msgid "Show offline contacts"
-msgstr "Ühendamata sõpru näidatakse"
-
-msgid "Show protocols"
-msgstr "Kuva protokolle"
-
-msgid "Spell checking languages"
-msgstr "Õigekirjakontrolli keeled"
-
-msgid "The default folder to save file transfers in."
-msgstr "Vaikimisi kataloog, kuhu salvestada vastuvõetud failid."
-
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Kataloog, kust viimati valiti avatari pilt."
-
-msgid "The position for the chat window side pane"
-msgstr "Vestlusakna külgpaneeli asukoht"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
 
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Vestlusakna külgpaneeli asukoht (pikslites)."
+msgid "Chat window theme"
+msgstr "Jututoaakende teema"
 
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
+msgid "Chat window theme variant"
+msgstr "Jututoaakende teema"
+
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Kujundus, mida kasutatakse jututoaakende vestluste kuvamisel."
 
-msgid "Use graphical smileys"
-msgstr "Tujunägudele kasutatakse pilte"
-
-msgid "Use notification sounds"
-msgstr "Teatehelisid esitatakse"
-
-msgid "Use theme for chat rooms"
-msgstr "Jututubadele kasutatakse teemat"
-
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
+msgid "Path of the Adium theme to use"
+msgstr "Kasutatava Adiumi kujunduse asukoht"
 
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Kasutatava Adiumi kujunduse asukoht, kui vestluse kujundus on Adium."
 
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer tööriistade lubamine"
 
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
 
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Kas Empathy peaks käivitumisel ise kontodesse sisse logima."
+msgid "Inform other users when you are typing to them"
+msgstr "Vestluskaaslastele antakse teada, kui sa parasjagu kirjutad neile"
 
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Kas Empathy peaks jõudeoleku korral määrama olekuks automaatselt eemaloleku."
+"Kas saata vestlusolekuid nagu 'composing' (kirjutab) või 'paused' (peatus). "
+"Praegu ei mõjuta 'gone' (eemal) olekut."
 
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
+msgid "Use theme for chat rooms"
+msgstr "Jututubadele kasutatakse teemat"
 
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Kas jututubadele kasutatakse kujundust või mitte."
 
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Kas WebKit developer tööriistad, näiteks Web Inspector, tuleks lubada."
+msgid "Spell checking languages"
+msgstr "Õigekirjakontrolli keeled"
 
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Kas automaatseks lahti- või taasühendumiseks tuleks kasutada ühenduste "
-"haldurit või mitte."
+"Komadega eraldatud loend õigekirjakontrolli keeltest (nt \"et, en, fi, ru\")."
+
+msgid "Enable spell checker"
+msgstr "Õigekirjakontrolli lubamine"
 
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Kas sisestatud sõnade õigsust tuleks kontrollida sinu valitud keelte järgi."
 
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Kas tujunäod tuleks teisendada vestlustes piltideks."
+msgid "Nick completed character"
+msgstr "Nimele lisamise märk"
 
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Kas lubada Pulseaudio kaja vähendamise filter."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Märk, mis lisatakse hüüdnime lõppu, kui jututoas kasutatakse nime "
+"automaatlõpetust (tab-klahv)."
 
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Kas esitada heli kontakti sisenemisest märkuandmiseks."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy peaks kasutama avatari vestlusakna ikoonina"
 
 msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Kas esitada heli kontakti väljumisest märkuandmiseks."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Kas Empathy peaks kasutama kontakti avatari vestlusakna ikoonina."
 
-msgid "Whether to play a sound to notify of events."
-msgstr "Kas esitada heli sündmustest märkuandmiseks."
+msgid "Last account selected in Join Room dialog"
+msgstr "Viimane konto, mis valiti \"Ühine jututoaga\" dialoogis"
 
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Kas esitada heli saabuvatest sõnumitest märkuandmiseks."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Toaga ühinemiseks viimati valitud konto D-Busi objekti asukoht"
 
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Kas esitada heli uutest vestlustest märkuandmiseks."
+msgid "Camera device"
+msgstr "Kaameraseade"
 
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Kas esitada heli väljuvatest sõnumitest märkuandmiseks."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Vaikimisi kaameraseade, mida kasutatakse videokõnede jaoks, nt /dev/video0"
 
-msgid "Whether to play a sound when logging into a network."
-msgstr "Kas esitada heli võrku sisselogimisest märkuandmiseks."
+msgid "Camera position"
+msgstr "Kaamera asukoht"
 
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Kas esitada heli võrgust väljumisest märkuandmiseks."
+msgid "Position the camera preview should be during a call."
+msgstr "Enda kaamera pildi asukoht kõne ajal."
 
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Kas esitada heli eemal või hõivatud oleku määramisest märkuandmiseks."
+msgid "Echo cancellation support"
+msgstr "Kaja vähendamise tugi"
 
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Kas näidata hüpikteadet kontakti väljumisest märkuandmiseks."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Kas lubada Pulseaudio kaja vähendamise filter."
 
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Kas näidata hüpikteadet kontakti sisenemisest märkuandmiseks."
+msgid "Show hint about closing the main window"
+msgstr "Peaakna sulgemise kohta näidatakse soovitust"
 
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Kas näidata hüpikteadet uue sõnumi saamisest märkuandmiseks isegi siis, kui "
-"vestlus on juba avatud, kuid mitte fookuses."
-
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Kas näidata hüpikteadet uue teate vastuvõtmisest märkuandmiseks."
+"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
 
-msgid "Whether to show account balances in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontojääki."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy tohib näidata kasutaja asukohta"
 
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Kas näidata kontaktide nimekirjas ja vestlusakendes avatare."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Kas Empathy võib avaldada kontaktidele kasutaja asukoha."
 
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontakte, kes pole ühendatud."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy tohib kasutada võrku asukoha arvamiseks"
 
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Kas näidata hüpikteateid olles eemal või hõivatud."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Kas Empathy võib kasutada võrku asukoha arvamiseks."
 
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Kas näidata kontaktide nimekirjas kontaktide protokolle."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy tohib kasutada mobiilivõrku asukoha arvamiseks"
 
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Kas jututubades näidatakse osalejate nimekirja või mitte."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Kas Empathy võib kasutada mobiilivõrku asukoha arvamiseks."
 
-msgid "Whether to show the contact list in compact mode."
-msgstr "Kas kontaktide nimekirja kuvatakse kompaktvaates või mitte."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy tohib kasutada GPS-i andmeid asukoha arvamiseks"
 
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Kas peaakna sulgemisel tiitliriba 'x' ristist küsitakse kinnitust või mitte."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Kas Empathy võib kasutada GPS-i asukoha arvamiseks."
 
-msgid "Whether to use the theme for chat rooms."
-msgstr "Kas jututubadele kasutatakse kujundust või mitte."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy peaks vähendama asukoha täpsust"
 
 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."
-msgstr ""
-"Kontaktide nimekirja sortimise alus. Vaikimisi on väärtus \"name\" ja sel "
-"juhul sorditakse kontaktid nime järgi. Väärtuse \"state\" korral toimub "
-"sortimine oleku järgi."
-
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Sõnumi- ja VoIP kontode haldamine"
-
-#. Tweak the dialog
-msgid "Messaging and VoIP Accounts"
-msgstr "Sõnumi- ja VoIP kontod"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Kas Empathy peaks privaatsuse tagamiseks vähendama asukoha täpsust."
 
 msgid "No reason was specified"
 msgstr "Põhjendust pole määratud."
@@ -505,8 +532,8 @@ msgstr "Ühendust pole võimalik luua"
 msgid "Connection has been lost"
 msgstr "Ühendus on katkenud"
 
-msgid "This resource is already connected to the server"
-msgstr "See ressurss on juba serverisse ühendunud"
+msgid "This account is already connected to the server"
+msgstr "Selle kontoga on juba serverisse ühendutud"
 
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
@@ -537,6 +564,9 @@ msgstr ""
 msgid "Your software is too old"
 msgstr "Sinu tarkvara on liiga vana"
 
+msgid "Internal error"
+msgstr "Sisemine viga"
+
 msgid "People Nearby"
 msgstr "Lähedalasuvad inimesed"
 
@@ -588,6 +618,17 @@ msgstr[1] "%d kuud tagasi"
 msgid "in the future"
 msgstr "tulevikus"
 
+msgid "Password not found"
+msgstr "Parooli ei leitud"
+
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s suhtluskonto parool (%s)"
+
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Jututoa '%s' parool kontol %s (%s)"
+
 msgid "All accounts"
 msgstr "Kõik kontod"
 
@@ -640,30 +681,18 @@ msgstr "%s konto"
 msgid "New account"
 msgstr "Uus konto"
 
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Näide:</b> MinuEkraaniNimi"
-
-msgid "Advanced"
-msgstr "Laiendatud"
-
 msgid "Pass_word:"
 msgstr "_Parool:"
 
-msgid "Remember Password"
-msgstr "Parooli peetakse meeles"
-
-#. remember password ticky box
-msgid "Remember password"
-msgstr "Parooli peetakse meeles"
-
 msgid "Screen _Name:"
 msgstr "Ekraani_nimi:"
 
-msgid "What is your AIM password?"
-msgstr "Mis on sinu AIM-i parool?"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Näide:</b> MinuEkraaniNimi"
 
-msgid "What is your AIM screen name?"
-msgstr "Mis on sinu AIM-i ekraaninimi?"
+#. remember password ticky box
+msgid "Remember password"
+msgstr "Parooli peetakse meeles"
 
 msgid "_Port:"
 msgstr "_Port:"
@@ -671,27 +700,39 @@ msgstr "_Port:"
 msgid "_Server:"
 msgstr "_Server:"
 
-msgid "<b>Example:</b> username"
-msgstr "<b>Näide:</b> kasutajanimi"
+msgid "Advanced"
+msgstr "Laiendatud"
+
+msgid "What is your AIM screen name?"
+msgstr "Mis on sinu AIM-i ekraaninimi?"
+
+msgid "What is your AIM password?"
+msgstr "Mis on sinu AIM-i parool?"
+
+msgid "Remember Password"
+msgstr "Parooli peetakse meeles"
 
 msgid "Login I_D:"
 msgstr "Sisselogimise I_D:"
 
+msgid "<b>Example:</b> username"
+msgstr "<b>Näide:</b> kasutajanimi"
+
 msgid "What is your GroupWise User ID?"
 msgstr "Mis on sinu GroupWise kasutaja ID?"
 
 msgid "What is your GroupWise password?"
 msgstr "Mis on sinu GroupWise parool?"
 
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Näide:</b> 123456789"
 
 msgid "Ch_aracter set:"
 msgstr "_Kooditabel:"
 
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
 msgid "What is your ICQ UIN?"
 msgstr "Mis on sinu ICQ UIN?"
 
@@ -723,9 +764,18 @@ msgstr "Valikud"
 msgid "None"
 msgstr "Puudub"
 
+msgid "Network"
+msgstr "Võrk"
+
+msgid "Network:"
+msgstr "Võrk:"
+
 msgid "Character set:"
 msgstr "Kooditabel:"
 
+msgid "Servers"
+msgstr "Serverid"
+
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -733,12 +783,6 @@ msgstr ""
 "Enamik IRC servereid ei vaja parooli. Kui sa pole kindel, ära sisesta "
 "parooli."
 
-msgid "Network"
-msgstr "Võrk"
-
-msgid "Network:"
-msgstr "Võrk:"
-
 msgid "Nickname:"
 msgstr "Hüüdnimi:"
 
@@ -751,35 +795,14 @@ msgstr "Lahkumise teade:"
 msgid "Real name:"
 msgstr "Pärisnimi:"
 
-msgid "Servers"
-msgstr "Serverid"
-
-msgid "What is your IRC nickname?"
-msgstr "Mis on sinu IRC ekraaninimi?"
-
 msgid "Which IRC network?"
 msgstr "Milline IRC võrk?"
 
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Näide:</b> kasutaja@gmail.com"
-
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Näide:</b> kasutaja@jabber.org"
-
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
-
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL-sertifikaadi vigu _eiratakse"
-
-msgid "Override server settings"
-msgstr "Serveri sätete eiramine"
-
-msgid "Priori_ty:"
-msgstr "_Tähtsus:"
+msgid "What is your IRC nickname?"
+msgstr "Mis on sinu IRC ekraaninimi?"
 
-msgid "Reso_urce:"
-msgstr "_Vahend:"
+msgid "What is your Facebook username?"
+msgstr "Mis on sinu Facebooki kasutajanimi?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 msgid ""
@@ -793,30 +816,48 @@ msgstr ""
 "Kui sul veel ei ole Facebooki kasutajanime, saad selle luua <a href=\"http://"
 "www.facebook.com/username/\">siin lehel</a>."
 
-msgid "Use old SS_L"
-msgstr "Kasutatakse _vana SSL-i"
-
 msgid "What is your Facebook password?"
 msgstr "Mis on sinu Facebooki parool?"
 
-msgid "What is your Facebook username?"
-msgstr "Mis on sinu Facebooki kasutajanimi?"
-
 msgid "What is your Google ID?"
 msgstr "Mis on sinu Google ID?"
 
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Näide:</b> kasutaja@gmail.com"
+
 msgid "What is your Google password?"
 msgstr "Mis on sinu Google parool?"
 
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Näide:</b> kasutaja@jabber.org"
+
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL-sertifikaadi vigu _eiratakse"
+
+msgid "Priori_ty:"
+msgstr "_Tähtsus:"
+
+msgid "Reso_urce:"
+msgstr "_Vahend:"
+
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Krüpteeringu nõudmine (TLS/SSL)"
+
+msgid "Use old SS_L"
+msgstr "Kasutatakse _vana SSL-i"
+
+msgid "Override server settings"
+msgstr "Serveri sätete eiramine"
+
 msgid "What is your Jabber ID?"
 msgstr "Mis on sinu Jabberi ID?"
 
-msgid "What is your Jabber password?"
-msgstr "Mis on sinu Jabberi parool?"
-
 msgid "What is your desired Jabber ID?"
 msgstr "Mis on sinu poolt eelistatav Jabberi ID?"
 
+msgid "What is your Jabber password?"
+msgstr "Mis on sinu Jabberi parool?"
+
 msgid "What is your desired Jabber password?"
 msgstr "Mis on sinu poolt eelistatav Jabberi parool?"
 
@@ -829,99 +870,99 @@ msgstr "Mis on sinu Windows Live ID?"
 msgid "What is your Windows Live password?"
 msgstr "Mis on sinu Windows Live parool?"
 
-msgid "E-_mail address:"
-msgstr "_Meiliaadress:"
-
 msgid "Nic_kname:"
 msgstr "_Hüüdnimi:"
 
+msgid "_Last Name:"
+msgstr "_Perekonnanimi:"
+
 msgid "_First Name:"
 msgstr "_Eesnimi:"
 
+msgid "_Published Name:"
+msgstr "_Avaldatud nimi:"
+
 msgid "_Jabber ID:"
 msgstr "_Jabberi ID:"
 
-msgid "_Last Name:"
-msgstr "_Perekonnanimi:"
+msgid "E-_mail address:"
+msgstr "_Meiliaadress:"
 
-msgid "_Published Name:"
-msgstr "_Avaldatud nimi:"
+msgid "_Username:"
+msgstr "_Kasutajanimi:"
 
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Näide:</b> kasutaja@minu.sip.server"
 
-msgid "Authentication username:"
-msgstr "Autentimise kasutajanimi:"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks"
 
-msgid "Discover Binding"
-msgstr "Seonduse avastamine"
+msgid "NAT Traversal Options"
+msgstr "NAT-traversal valikud"
+
+msgid "Proxy Options"
+msgstr "Proksi valikud"
+
+msgid "Miscellaneous Options"
+msgstr "Muud valikud"
+
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 msgid "Discover the STUN server automatically"
 msgstr "STUN-serveri automaatne tuvastus"
 
-msgid "Ignore TLS Errors"
-msgstr "TLS vigasid eiratakse"
+msgid "Discover Binding"
+msgstr "Seonduse avastamine"
 
-msgid "Interval (seconds)"
-msgstr "Intervall (sekundites)"
+msgid "Server:"
+msgstr "Server:"
 
 msgid "Keep-Alive Options"
 msgstr "Ühenduse elushoidmise valikud"
 
-msgid "Loose Routing"
-msgstr "Vaba marsruutimine"
-
 msgid "Mechanism:"
 msgstr "Mehhanism:"
 
-msgid "Miscellaneous Options"
-msgstr "Muud valikud"
-
-msgid "NAT Traversal Options"
-msgstr "NAT-traversal valikud"
-
-msgid "Port:"
-msgstr "Port:"
-
-msgid "Proxy Options"
-msgstr "Proksi valikud"
-
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekundites)"
 
-msgid "Server:"
-msgstr "Server:"
+msgid "Authentication username:"
+msgstr "Autentimise kasutajanimi:"
 
 msgid "Transport:"
 msgstr "Transport:"
 
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Seda kontot kasutatakse _fiksvõrku ja mobiiltelefonidele helistamiseks"
+msgid "Loose Routing"
+msgstr "Vaba marsruutimine"
 
-msgid "What is your SIP account password?"
-msgstr "Mis on sinu SIP-konto parool?"
+msgid "Ignore TLS Errors"
+msgstr "TLS vigasid eiratakse"
+
+msgid "Port:"
+msgstr "Port:"
 
 msgid "What is your SIP login ID?"
 msgstr "Mis on sinu SIP-i sisselogimise ID?"
 
-msgid "_Username:"
-msgstr "_Kasutajanimi:"
+msgid "What is your SIP account password?"
+msgstr "Mis on sinu SIP-konto parool?"
+
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
 
 msgid "I_gnore conference and chat room invitations"
 msgstr "Konverentside ja jututubade kutseid _eiratakse"
 
+msgid "_Room List locale:"
+msgstr "_Tubade nimekirja lokaat:"
+
 msgid "What is your Yahoo! ID?"
 msgstr "Mis on sinu Yahoo! ID?"
 
 msgid "What is your Yahoo! password?"
 msgstr "Mis on sinu Yahoo! parool?"
 
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-msgid "_Room List locale:"
-msgstr "_Tubade nimekirja lokaat:"
-
 msgid "Couldn't convert image"
 msgstr "Pole võimalik pilti teisendada"
 
@@ -1086,6 +1127,11 @@ msgstr "Teema:"
 msgid "Topic set to: %s"
 msgstr "Teema on: %s"
 
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s määras uue teema: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
 msgid "No topic defined"
 msgstr "Teemat pole seatud"
 
@@ -1246,9 +1292,6 @@ msgstr "_Ava link"
 msgid "%A %B %d %Y"
 msgstr "%A, %d. %B %Y"
 
-msgid "Personal Information"
-msgstr "Isiklikud andmed"
-
 msgid "New Contact"
 msgstr "Uus kontakt"
 
@@ -1270,15 +1313,15 @@ msgid_plural "_Report these contacts as abusive"
 msgstr[0] "_Teata sellest kuritarvitavast kasutajast"
 msgstr[1] "_Teata nendest kuritarvitavatest kasutajatest"
 
-msgid "Decide _Later"
-msgstr "Otsusta _hiljem"
-
 msgid "Subscription Request"
 msgstr "Tellimuse päring"
 
 msgid "_Block User"
 msgstr "_Blokeeri kasutaja"
 
+msgid "Decide _Later"
+msgstr "Otsusta _hiljem"
+
 #. Title
 msgid "Search contacts"
 msgstr "Kontaktide otsimine"
@@ -1390,6 +1433,12 @@ msgstr "Avatari salvestamine"
 msgid "Unable to save avatar"
 msgstr "Avatari salvestamine pole võimalik"
 
+msgid "Personal Details"
+msgstr "Isiklikud andmed"
+
+msgid "Contact Details"
+msgstr "Kontaktandmed"
+
 msgid "Full name"
 msgstr "Täisnimi"
 
@@ -1440,36 +1489,33 @@ msgstr "postipakk"
 msgid "parcel"
 msgstr "kullerpakk"
 
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Asukoht</b> kuupäeval\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+msgid "Identifier:"
+msgstr "Kasutajanimi:"
 
 #. Alias
 msgid "Alias:"
 msgstr "Alias:"
 
-msgid "Client Information"
-msgstr "Kliendi andmed"
-
-msgid "Client:"
-msgstr "Klient:"
-
-msgid "Contact Details"
-msgstr "Kontaktandmed"
-
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
-msgid "Identifier:"
-msgstr "Kasutajanimi:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Asukoht</b> kuupäeval\t"
 
 msgid "Information requested…"
 msgstr "Päriti andmeid…"
 
+msgid "Client Information"
+msgstr "Kliendi andmed"
+
 msgid "OS:"
 msgstr "OS:"
 
 msgid "Version:"
 msgstr "Versioon:"
 
+msgid "Client:"
+msgstr "Klient:"
+
 msgid "Groups"
 msgstr "Grupid"
 
@@ -1503,19 +1549,6 @@ msgstr[1] "Järgnevaid isikuid pole võimalik blokkida:"
 msgid "Edit Contact Information"
 msgstr "Kontakti andmete redigeerimine"
 
-#. Translators: the heading at the top of the Information dialogue
-msgid "Linked Contacts"
-msgstr "Liidetud kontaktid"
-
-msgid "Select contacts to link"
-msgstr "Vali kontaktid, keda kokku liita"
-
-msgid "New contact preview"
-msgstr "Uue kontakti eelvaade"
-
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Vasakul nimekirjas olevad kontaktid liidetakse kokku."
-
 #. 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).
@@ -1571,6 +1604,12 @@ msgstr "Jaga minu töölauda"
 msgid "Favorite"
 msgstr "Lemmik"
 
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts pole paigaldatud"
+
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Kontakti andmete kuvamiseks paigalda palun gnome-contacts."
+
 msgid "Infor_mation"
 msgstr "_Andmed"
 
@@ -1578,12 +1617,6 @@ msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Redaktor"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ühenda kontaktid…"
-
 msgid "Inviting you to this room"
 msgstr "Kutse sellesse tuppa"
 
@@ -1653,42 +1686,6 @@ msgstr "uus server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-msgid "Link Contacts"
-msgstr "Kontaktide ühendamine"
-
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Eralda kontaktid…"
-
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Lingitud kontakti lahutamine seda moodustavateks kontaktideks."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-msgid "_Link"
-msgstr "_Ühenda"
-
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Kas lahutada lingitud kontakt '%s' osadeks?"
-
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Kas sa oled kindel, et tahad need lingitud kontakti eraldada? Sellega muutub "
-"lingitud kontakt jälle eraldi kontaktideks."
-
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Eralda"
-
 msgid "History"
 msgstr "Ajalugu"
 
@@ -1789,11 +1786,11 @@ msgstr "Puhasta kõik"
 msgid "Delete from:"
 msgstr "Kustuta kust:"
 
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Laadimine...</span>"
+msgid "_File"
+msgstr "_Fail"
 
-msgid "Chat"
-msgstr "Vestlus"
+msgid "_Edit"
+msgstr "_Redaktor"
 
 msgid "Delete All History..."
 msgstr "Kogu ajaloo kustutamine..."
@@ -1801,18 +1798,18 @@ msgstr "Kogu ajaloo kustutamine..."
 msgid "Profile"
 msgstr "Profiil"
 
+msgid "Chat"
+msgstr "Vestlus"
+
 msgid "Video"
 msgstr "Video"
 
-msgid "_Edit"
-msgstr "_Redaktor"
-
-msgid "_File"
-msgstr "_Fail"
-
 msgid "page 2"
 msgstr "leht 2"
 
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Laadimine...</span>"
+
 msgid "The contact is offline"
 msgstr "Kontakt pole võrku ühendatud"
 
@@ -1913,18 +1910,18 @@ msgstr "Uus %s konto"
 msgid "Find:"
 msgstr "Otsi:"
 
+msgid "_Previous"
+msgstr "_Eelmine"
+
+msgid "_Next"
+msgstr "_Järgmine"
+
 msgid "Mat_ch case"
 msgstr "_Tõstutundlik"
 
 msgid "Phrase not found"
 msgstr "Fraasi ei leitud"
 
-msgid "_Next"
-msgstr "_Järgmine"
-
-msgid "_Previous"
-msgstr "_Eelmine"
-
 msgid "Received an instant message"
 msgstr "Võeti vastu välksõnum"
 
@@ -2019,8 +2016,11 @@ msgstr "Oodatud hostinimi: %s"
 msgid "Certificate hostname: %s"
 msgstr "Sertifikaadi hostinimi: %s"
 
-msgid "Continue"
-msgstr "Jätka"
+msgid "C_ontinue"
+msgstr "_Jätka"
+
+msgid "Untrusted connection"
+msgstr "Ebausaldusväärne ühendus"
 
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ühendus pole usaldusväärne. Kas tahad siiski jätkata?"
@@ -2213,130 +2213,6 @@ msgstr ""
 "Ivar Smolin <okul linux ee>, 2005–2011.\n"
 "Mattias Põldaru <mahfiaz gmail com>, 2009–2010."
 
-msgid "There was an error while importing the accounts."
-msgstr "Kontode importimise käigus tekkis viga."
-
-msgid "There was an error while parsing the account details."
-msgstr "Konto üksikasjade analüüsimisel tekkis viga."
-
-msgid "There was an error while creating the account."
-msgstr "Konto loomisel tekkis viga."
-
-msgid "There was an error."
-msgstr "Tekkis viga."
-
-#, c-format
-msgid "The error message was: %s"
-msgstr "Veateade oli: %s"
-
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Sul on võimalik minna tagasi ja proovida uuesti oma konto üksikasju määrata. "
-"Samuti on võimalik seadistamisabiline praegu sulgeda ja lisada kontosid "
-"hiljem (menüüst \"Redaktor\")."
-
-msgid "An error occurred"
-msgstr "Tekkis viga"
-
-msgid "What kind of chat account do you have?"
-msgstr "Mis sorti konto sul on?"
-
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Kas sul on veel mõni konto, mida soovid seadistada?"
-
-msgid "Enter your account details"
-msgstr "Määra oma konto üksikasjad"
-
-msgid "What kind of chat account do you want to create?"
-msgstr "Mis liiki vestluskontot sa soovid luua?"
-
-msgid "Do you want to create other chat accounts?"
-msgstr "Kas soovid luua veel mõne vestlemiskonto?"
-
-msgid "Enter the details for the new account"
-msgstr "Määra uue konto üksikasjad"
-
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy abil saad suhelda lähinaabruses asuvate inimestega, samuti sõprade "
-"ja kolleegidega, kes kasutavad Google Talk-i, AIM-i, Windows Live-i või "
-"teisi rakendusi. Mikrofoni või veebikaameraga võid teha ka tavalisi või "
-"videokõnesid."
-
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Kas sul on juba mõni konto, mida sa mõne teise vestlusprogrammiga kasutad?"
-
-msgid "Yes, import my account details from "
-msgstr "Jah, impordi mu konto andmed rakendusest "
-
-msgid "Yes, I'll enter my account details now"
-msgstr "Jah, ma määran oma konto andmed ise"
-
-msgid "No, I want a new account"
-msgstr "Ei, ma tahan uut kontot"
-
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ei, ma tahan lihtsalt näha, kes mu lähinaabruses asuvad"
-
-msgid "Select the accounts you want to import:"
-msgstr "Vali imporditavad kontod:"
-
-msgid "Yes"
-msgstr "Jah"
-
-msgid "No, that's all for now"
-msgstr "Ei, see on praeguseks kõik"
-
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy võib automaatselt avastada ja võimaldada vestlused inimestega, kes "
-"on samas võrgus. Kui sa tahad seda võimalust, veendu, et allasuvad andmed on "
-"õiged. Neid saab hiljem lihtsalt muuta või kogu selle konto keelata "
-"dialoogist \"Kontod\"."
-
-msgid "Edit->Accounts"
-msgstr "Redaktor->Kontod"
-
-msgid "I do _not want to enable this feature for now"
-msgstr "Ma _ei taha seda võimalust praegu lubada"
-
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Kui telepathy-salut pole paigaldatud, ei saa sa vestelda kohtvõrgus olevate "
-"inimestega. Kui sa tahad seda võimalust kasutada, pead paigaldama telepathy-"
-"salut paketi ja looma kontode dialoogiaknas \"Lähedalasuvate inimeste\" "
-"konto."
-
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut pole paigaldatud"
-
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Sõnumite ja VoIP kontode abiline"
-
-msgid "Welcome to Empathy"
-msgstr "Tere tulemast Empathy kasutajaks"
-
-msgid "Import your existing accounts"
-msgstr "Sinu olemasolevate kontode importimine"
-
-msgid "Please enter personal details"
-msgstr "Palun sisesta isiklikud andmed"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
 #, c-format
@@ -2365,6 +2241,15 @@ msgstr "Ühendamata — puudub võrguühendus"
 msgid "Unknown Status"
 msgstr "Tundmatu olek"
 
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"See konto on keelatud, kuna see kasutab vana, mitte toetatud tugiprogrammi. "
+"Palun paigalda telepathy-haze ja logi välja ning uuesti sisse, et konto üle "
+"kanda."
+
 msgid "Offline — Account Disabled"
 msgstr "Ühendamata — konto keelatud"
 
@@ -2401,6 +2286,12 @@ msgstr "_Luba"
 msgid "_Disable"
 msgstr "_Keela"
 
+msgid "_Skip"
+msgstr "_Jäta vahele"
+
+msgid "_Connect"
+msgstr "_Ühendu"
+
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2411,15 +2302,12 @@ msgstr ""
 msgid "Add…"
 msgstr "Lisa…"
 
+msgid "_Import…"
+msgstr "_Impordi…"
+
 msgid "Loading account information"
 msgstr "Konto andmete laadimine"
 
-msgid "No protocol installed"
-msgstr "Ühtegi protokolli pole paigaldatud"
-
-msgid "Protocol:"
-msgstr "Protokoll:"
-
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -2427,8 +2315,8 @@ msgstr ""
 "Uue konto lisamiseks pead paigaldama tugiprogrammi iga protokolli jaoks, "
 "mida tahad kasutada."
 
-msgid "_Import…"
-msgstr "_Impordi…"
+msgid "No protocol backends installed"
+msgstr "Ühtegi protokolli tugiprogrammi pole paigaldatud"
 
 msgid " - Empathy authentication client"
 msgstr " - Empathy autentimisklient"
@@ -2436,9 +2324,6 @@ msgstr " - Empathy autentimisklient"
 msgid "Empathy authentication client"
 msgstr "Empathy autentimisklient"
 
-msgid "People nearby"
-msgstr "Lähedalasuvad inimesed"
-
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy audio/video klient"
 
@@ -2455,13 +2340,13 @@ msgid "Gamma"
 msgstr "Gamma"
 
 msgid "Volume"
-msgstr "Valjus"
+msgstr "Helitugevus"
 
 msgid "_Sidebar"
 msgstr "_Külgriba"
 
 msgid "Audio input"
-msgstr "Helisisend"
+msgstr "Audiosisend"
 
 msgid "Video input"
 msgstr "Videosisend"
@@ -2470,7 +2355,7 @@ msgid "Dialpad"
 msgstr "Sõrmlaud"
 
 msgid "Details"
-msgstr "Üksikasjad"
+msgstr "Andmed"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
@@ -2550,7 +2435,7 @@ msgid ""
 msgstr ""
 "Telepathy komponendiga juhtus midagi ootamatut. Palun <a href=\"%s"
 "\">raporteeri sellest veast</a> ja lisa manusena logid, mille saad "
-"'Silumine' nupu alt abimenüüst."
+"'Silumise' nupu alt abimenüüst."
 
 msgid "There was a failure in the call engine"
 msgstr "Helistamismootoris esines viga"
@@ -2564,47 +2449,50 @@ msgstr "Helivoogu pole võimalik alustada"
 msgid "Can't establish video stream"
 msgstr "Videovoogu pole võimalik alustada"
 
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Helista"
 
-msgid "Decoding Codec:"
-msgstr "Dekodeeriv koodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
-msgid "Disable camera"
-msgstr "Keela kaamera"
+msgid "_Camera"
+msgstr "_Kaamera"
 
-msgid "Display the dialpad"
-msgstr "Kuva sõrmlaud"
+msgid "_Settings"
+msgstr "_Seaded"
 
-msgid "Encoding Codec:"
-msgstr "Kodeeriv koodek:"
+msgid "_View"
+msgstr "_Vaade"
 
-msgid "Hang up"
-msgstr "Toru hargile"
+msgid "_Help"
+msgstr "A_bi"
 
-msgid "Hang up current call"
-msgstr "Praeguse kõne lõpetamine"
+msgid "_Contents"
+msgstr "_Sisukord"
 
-msgid "Local Candidate:"
-msgstr "Kohalik kandidaat:"
+msgid "_Debug"
+msgstr "Si_lumine"
 
-msgid "Maximise me"
-msgstr "Maksimeeri mind"
+msgid "Swap camera"
+msgstr "Kaamera vahetamine"
 
 msgid "Minimise me"
 msgstr "Minimeeri mind"
 
-msgid "Remote Candidate:"
-msgstr "Kaugkandidaat:"
+msgid "Maximise me"
+msgstr "Maksimeeri mind"
 
-msgid "Send Audio"
-msgstr "Saada heli"
+msgid "Disable camera"
+msgstr "Keela kaamera"
 
-msgid "Send Video"
-msgstr "Video saatmine"
+msgid "Hang up"
+msgstr "Toru hargile"
 
-msgid "Show dialpad"
-msgstr "Sõrmlaua näitamine"
+msgid "Hang up current call"
+msgstr "Praeguse kõne lõpetamine"
+
+msgid "Video call"
+msgstr "Videokõne"
 
 msgid "Start a video call"
 msgstr "Videokõne alustamine"
@@ -2612,44 +2500,81 @@ msgstr "Videokõne alustamine"
 msgid "Start an audio call"
 msgstr "Audiokõne alustamine"
 
-msgid "Swap camera"
-msgstr "Kaamera vahetamine"
+msgid "Show dialpad"
+msgstr "Sõrmlaua näitamine"
 
-msgid "Toggle audio transmission"
-msgstr "Heliedastuse lüliti"
+msgid "Display the dialpad"
+msgstr "Kuva sõrmlaud"
+
+msgid "Send Video"
+msgstr "Video saatmine"
 
 msgid "Toggle video transmission"
 msgstr "Videoedastuse lüliti"
 
+msgid "Send Audio"
+msgstr "Saada heli"
+
+msgid "Toggle audio transmission"
+msgstr "Heliedastuse lüliti"
+
+msgid "Encoding Codec:"
+msgstr "Kodeeriv koodek:"
+
 msgid "Unknown"
 msgstr "Tundmatu"
 
-msgid "Video call"
-msgstr "Videokõne"
+msgid "Decoding Codec:"
+msgstr "Dekodeeriv koodek:"
 
-msgid "_Call"
-msgstr "_Helista"
+msgid "Remote Candidate:"
+msgstr "Kaugkandidaat:"
 
-msgid "_Camera"
-msgstr "_Kaamera"
+msgid "Local Candidate:"
+msgstr "Kohalik kandidaat:"
 
-msgid "_Contents"
-msgstr "_Sisukord"
+msgid "Audio"
+msgstr "Audio"
 
-msgid "_Debug"
-msgstr "Si_lumine"
+msgid "Close this window?"
+msgstr "Kas sulgeda see aken?"
 
-msgid "_Help"
-msgstr "A_bi"
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Selle akna sulgemisega lahkud %s võrgust. Kuni uuesti ühendumiseni ei saa sa "
+"ühtegi teadet."
 
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Selle akna sulgemisega lahkud jututoast. Kuni uuesti ühendumiseni ei saa sa "
+"ühtegi teadet."
+msgstr[1] ""
+"Selle akna sulgemisega lahkud %u jututoast. Kuni uuesti ühendumiseni ei saa "
+"sa ühtegi teadet."
+
+#, c-format
+msgid "Leave %s?"
+msgstr "Kas lahkuda toast %s?"
 
-msgid "_Settings"
-msgstr "_Seaded"
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Kuni uuesti ühendumiseni ei saa sa sellest jututoast ühtegi teadet."
 
-msgid "_View"
-msgstr "_Vaade"
+msgid "Close window"
+msgstr "Sulge aken"
+
+msgid "Leave room"
+msgstr "Lahku toast"
 
 #, c-format
 msgid "%s (%d unread)"
@@ -2687,51 +2612,51 @@ msgstr[1] "%d sõnumi saatmine"
 msgid "Typing a message."
 msgstr "Kirjutab sõnumit."
 
+msgid "_Conversation"
+msgstr "_Vestlus"
+
 msgid "C_lear"
 msgstr "_Puhasta"
 
-msgid "C_ontact"
-msgstr "_Kontakt"
-
 msgid "Insert _Smiley"
 msgstr "Lisa _tujunägu"
 
-msgid "Invite _Participant…"
-msgstr "Kutsu _osaline…"
-
-msgid "Move Tab _Left"
-msgstr "Tõsta kaart _vasakule"
-
-msgid "Move Tab _Right"
-msgstr "Tõsta kaart _paremale"
+msgid "_Favorite Chat Room"
+msgstr "_Lemmikjututuba"
 
 msgid "Notify for All Messages"
 msgstr "Teavitamine kõigist sõnumitest"
 
-msgid "_Conversation"
-msgstr "_Vestlus"
+msgid "_Show Contact List"
+msgstr "_Sõbranimekirja näidatakse"
 
-msgid "_Detach Tab"
-msgstr "_Haagi kaart lahti"
+msgid "Invite _Participant…"
+msgstr "Kutsu _osaline…"
 
-msgid "_Favorite Chat Room"
-msgstr "_Lemmikjututuba"
+msgid "C_ontact"
+msgstr "_Kontakt"
 
-msgid "_Next Tab"
-msgstr "_Järgmine kaart"
+msgid "_Tabs"
+msgstr "_Sakid"
 
 msgid "_Previous Tab"
 msgstr "_Eelmine kaart"
 
-msgid "_Show Contact List"
-msgstr "_Sõbranimekirja näidatakse"
-
-msgid "_Tabs"
-msgstr "_Sakid"
+msgid "_Next Tab"
+msgstr "_Järgmine kaart"
 
 msgid "_Undo Close Tab"
 msgstr "_Võta saki sulgemine tagasi"
 
+msgid "Move Tab _Left"
+msgstr "Tõsta kaart _vasakule"
+
+msgid "Move Tab _Right"
+msgstr "Tõsta kaart _paremale"
+
+msgid "_Detach Tab"
+msgstr "_Haagi kaart lahti"
+
 msgid "Name"
 msgstr "Nimi"
 
@@ -2908,6 +2833,9 @@ msgstr "Failiülekanded"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Lõpetatud, katkestatud ja nurjunud failide eemaldamine loendist"
 
+msgid "_Import"
+msgstr "_Impordi"
+
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -2934,6 +2862,9 @@ msgstr "Parooli sisestamine"
 msgid "Disconnect"
 msgstr "Katkesta ühendus"
 
+msgid "You need to setup an account to see contacts here."
+msgstr "Siin kontaktide nägemiseks pead mõne konto seadistama."
+
 msgid "No match found"
 msgstr "Vastavust ei leitud"
 
@@ -2956,7 +2887,7 @@ msgid "Edit Account"
 msgstr "Konto redigeerimine"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
+#. * Top up My Account ($1.23)..."
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Lae %s kontot (%s)..."
@@ -2971,38 +2902,55 @@ msgstr "Lae kontot..."
 msgid "Contact"
 msgstr "Kontakt"
 
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Siin kontaktide nägemiseks pead lubama vähemalt ühe oma kontodest."
+
+#. translators: argument is an account name
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Pead lubama %s konto, et näha siin kontakte."
+
 msgid "Contact List"
 msgstr "Kontaktide nimekiri"
 
-msgid "Contacts on a _Map"
-msgstr "Kontaktid _kaardil"
+msgid "Account settings"
+msgstr "Konto sätted"
 
-msgid "Credit Balance"
-msgstr "Kontojääk"
+msgid "_New Conversation…"
+msgstr "_Uus vestlus…"
 
-msgid "Find in Contact _List"
-msgstr "_Otsi kontaktide nimekirjast"
+msgid "New _Call…"
+msgstr "Uus _kõne…"
 
-msgid "Join _Favorites"
-msgstr "Ühine _lemmiktubadega"
+msgid "_Search for Contacts…"
+msgstr "_Otsi kontakte…"
 
-msgid "Manage Favorites"
-msgstr "Lemmiktubade haldamine"
+msgid "_File Transfers"
+msgstr "_Failiülekanded"
 
-msgid "N_ormal Size"
-msgstr "No_rmaalsuurus"
+msgid "_Offline Contacts"
+msgstr "Ü_hendamata kontaktid"
 
-msgid "New _Call…"
-msgstr "Uus _kõne…"
+msgid "Show P_rotocols"
+msgstr "Kuva _protokolle"
 
-msgid "Normal Size With _Avatars"
-msgstr "Normaalsuurus _avataridega"
+msgid "Credit Balance"
+msgstr "Kontojääk"
+
+msgid "Contacts on a _Map"
+msgstr "Kontaktid _kaardil"
+
+msgid "_Accounts"
+msgstr "_Kontod"
+
+msgid "_Blocked Contacts"
+msgstr "_Blokitud kontaktid"
 
 msgid "P_references"
 msgstr "_Eelistused"
 
-msgid "Show P_rotocols"
-msgstr "Kuva _protokolle"
+msgid "Find in Contact _List"
+msgstr "_Otsi kontaktide nimekirjast"
 
 msgid "Sort by _Name"
 msgstr "Sortimine _nime järgi"
@@ -3010,35 +2958,26 @@ msgstr "Sortimine _nime järgi"
 msgid "Sort by _Status"
 msgstr "Sortimine _oleku järgi"
 
-msgid "_Accounts"
-msgstr "_Kontod"
+msgid "Normal Size With _Avatars"
+msgstr "Normaalsuurus _avataridega"
 
-msgid "_Blocked Contacts"
-msgstr "_Blokitud kontaktid"
+msgid "N_ormal Size"
+msgstr "No_rmaalsuurus"
 
 msgid "_Compact Size"
 msgstr "_Kompaktne"
 
-msgid "_File Transfers"
-msgstr "_Failiülekanded"
+msgid "_Room"
+msgstr "_Tuba"
 
 msgid "_Join…"
 msgstr "Ü_hine…"
 
-msgid "_New Conversation…"
-msgstr "_Uus vestlus…"
-
-msgid "_Offline Contacts"
-msgstr "Ü_hendamata kontaktid"
-
-msgid "_Personal Information"
-msgstr "_Isiklikud andmed"
-
-msgid "_Room"
-msgstr "_Tuba"
+msgid "Join _Favorites"
+msgstr "Ühine _lemmiktubadega"
 
-msgid "_Search for Contacts…"
-msgstr "_Otsi kontakte…"
+msgid "Manage Favorites"
+msgstr "Lemmiktubade haldamine"
 
 msgid "Chat Room"
 msgstr "Jututuba"
@@ -3060,6 +2999,9 @@ msgstr ""
 "Nõutakse parooli: %s\n"
 "Liikmeid: %s"
 
+msgid "Yes"
+msgstr "Jah"
+
 msgid "No"
 msgstr "Ei"
 
@@ -3069,8 +3011,8 @@ msgstr "Tubade nimekirja pole võimalik alustada"
 msgid "Could not stop room listing"
 msgstr "Tubade nimekirja pole võimalik lõpetada"
 
-msgid "Couldn't load room list"
-msgstr "Tubade nimekirja pole võimalik laadida"
+msgid "Join Room"
+msgstr "Toaga ühinemine"
 
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
@@ -3078,6 +3020,9 @@ msgstr ""
 "Sisesta jututoa nimi, millega tahad liituda, või klõpsa loendis oleva toa "
 "nimele."
 
+msgid "_Room:"
+msgstr "_Tuba:"
+
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -3085,15 +3030,12 @@ msgstr ""
 "Sisesta server, mis võõrustab jututuba, või jäta tühjaks, kui tuba on "
 "praeguse konto serveris"
 
-msgid "Join Room"
-msgstr "Toaga ühinemine"
+msgid "Couldn't load room list"
+msgstr "Tubade nimekirja pole võimalik laadida"
 
 msgid "Room List"
 msgstr "Tubade nimekiri"
 
-msgid "_Room:"
-msgstr "_Tuba:"
-
 msgid "Message received"
 msgstr "Sõnumi vastuvõtmine"
 
@@ -3103,7 +3045,7 @@ msgstr "Sõnumi saatmine"
 msgid "New conversation"
 msgstr "Uus vestlus"
 
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakti sisenemine"
 
 msgid "Contact goes offline"
@@ -3153,23 +3095,71 @@ msgstr "Julia lahkus"
 msgid "Preferences"
 msgstr "Eelistused"
 
+msgid "Show _smileys as images"
+msgstr "_Tujunägusid näidatakse piltidena"
+
+msgid "Show contact _list in rooms"
+msgstr "Jututubades näidatakse kontaktide _loendit"
+
 msgid "Appearance"
 msgstr "Välimus"
 
+msgid "Start chats in:"
+msgstr "Jututoad asuvad:"
+
+msgid "new ta_bs"
+msgstr "uutel _kaartidel"
+
+msgid "new _windows"
+msgstr "uutes _akendes"
+
+msgid "Display incoming events in the notification area"
+msgstr "Sissetulevaid sündmuseid kuvatakse teatealal"
+
+msgid "_Automatically connect on startup"
+msgstr "_Käivitumisel ühendutakse automaatselt"
+
+msgid "Log conversations"
+msgstr "Vestluseid logitakse"
+
 msgid "Behavior"
 msgstr "Käitumine"
 
-msgid "Chat Th_eme:"
-msgstr "Vestluse _teema:"
+msgid "General"
+msgstr "Üldine"
+
+msgid "_Enable bubble notifications"
+msgstr "_Teatemullid on lubatud"
 
 msgid "Disable notifications when _away or busy"
 msgstr "_Eemal- või hõivatud oleku korral on teated keelatud"
 
+msgid "Enable notifications when the _chat is not focused"
+msgstr "_Fokuseerimata jututoa teated on lubatud"
+
+msgid "Enable notifications when a contact comes online"
+msgstr "Teatatakse kontakti sisenemisest"
+
+msgid "Enable notifications when a contact goes offline"
+msgstr "Teatatakse kontakti väljumisest"
+
+msgid "Notifications"
+msgstr "Teavitamisviisid"
+
+msgid "_Enable sound notifications"
+msgstr "_Heliteated on lubatud"
+
 msgid "Disable sounds when _away or busy"
 msgstr "_Eemal- või hõivatud oleku korral on helid keelatud"
 
-msgid "Display incoming events in the notification area"
-msgstr "Sissetulevaid sündmuseid kuvatakse teatealal"
+msgid "Play sound for events"
+msgstr "Helisid esitatakse järgnevate sündmuste puhul"
+
+msgid "Sounds"
+msgstr "Helid"
+
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks"
 
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
@@ -3182,35 +3172,8 @@ msgstr ""
 "kuuleb imelikku müra või krõpse kõne ajal, proovi kaja vähendamine välja "
 "lülitada ja helista uuesti."
 
-msgid "Enable notifications when a contact comes online"
-msgstr "Teatatakse kontakti sisenemisest"
-
-msgid "Enable notifications when a contact goes offline"
-msgstr "Teatatakse kontakti väljumisest"
-
-msgid "Enable notifications when the _chat is not focused"
-msgstr "_Fokuseerimata jututoa teated on lubatud"
-
-msgid "Enable spell checking for languages:"
-msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
-
-msgid "General"
-msgstr "Üldine"
-
-msgid "Location sources:"
-msgstr "Asukohaallikad:"
-
-msgid "Log conversations"
-msgstr "Vestluseid logitakse"
-
-msgid "Notifications"
-msgstr "Teavitamisviisid"
-
-msgid "Play sound for events"
-msgstr "Helisid esitatakse järgnevate sündmuste puhul"
-
-msgid "Privacy"
-msgstr "Privaatsus"
+msgid "_Publish location to my contacts"
+msgstr "_Minu asukoht avaldatakse kontaktidele"
 
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
@@ -3220,17 +3183,24 @@ msgstr ""
 "Vähendatud asukoha täpsuse korral avaldatakse ainult linn, maakond ja riik. "
 "GPSi laius- ja pikkuskraadid ümardatakse kümnendkohani."
 
-msgid "Show _smileys as images"
-msgstr "_Tujunägusid näidatakse piltidena"
+#. 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.
+msgid "_Reduce location accuracy"
+msgstr "_Asukoha täpsust vähendatakse"
 
-msgid "Show contact _list in rooms"
-msgstr "Jututubades näidatakse kontaktide _loendit"
+msgid "Privacy"
+msgstr "Privaatsus"
 
-msgid "Sounds"
-msgstr "Helid"
+msgid "_GPS"
+msgstr "_GPS"
 
-msgid "Spell Checking"
-msgstr "Õigekirjakontroll"
+msgid "_Cellphone"
+msgstr "_Mobiiltelefon"
+
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Võrk (IP, Wi-Fi)"
+
+msgid "Location sources:"
+msgstr "Asukohaallikad:"
 
 msgid ""
 "The list of languages reflects only the languages for which you have a "
@@ -3239,84 +3209,62 @@ msgstr ""
 "Keelte nimekiri kajastab ainult neid keeli, mille jaoks on paigaldatud "
 "sõnastik."
 
-msgid "Themes"
-msgstr "Teemad"
+msgid "Enable spell checking for languages:"
+msgstr "Õigekirjakontroll on lubatud järgmistele keeltele:"
 
-msgid "Use _echo cancellation to improve call quality"
-msgstr "_Kaja vähendamine kõne kvaliteedi parendamiseks"
+msgid "Spell Checking"
+msgstr "Õigekirjakontroll"
+
+msgid "Chat Th_eme:"
+msgstr "Vestluse _teema:"
 
 msgid "Variant:"
 msgstr "Variant:"
 
-msgid "_Automatically connect on startup"
-msgstr "_Käivitumisel ühendutakse automaatselt"
-
-msgid "_Cellphone"
-msgstr "_Mobiiltelefon"
-
-msgid "_Enable bubble notifications"
-msgstr "_Teatemullid on lubatud"
-
-msgid "_Enable sound notifications"
-msgstr "_Heliteated on lubatud"
+msgid "Themes"
+msgstr "Teemad"
 
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Status"
+msgstr "Olek"
 
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Võrk (IP, Wi-Fi)"
+msgid "_Quit"
+msgstr "_Lõpeta"
 
-msgid "_Open new chats in separate windows"
-msgstr "_Uued vestlused avanevad eraldi akendes"
+msgid "Redial"
+msgstr "Vali uuesti"
 
-msgid "_Publish location to my contacts"
-msgstr "_Minu asukoht avaldatakse kontaktidele"
+msgid "V_ideo"
+msgstr "V_ideo"
 
-#. 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.
-msgid "_Reduce location accuracy"
-msgstr "_Asukoha täpsust vähendatakse"
+msgid "Video Off"
+msgstr "Video välja"
 
-msgid "Status"
-msgstr "Olek"
+msgid "Video Preview"
+msgstr "Video eelvaade"
 
-msgid "_Quit"
-msgstr "_Lõpeta"
+msgid "Video On"
+msgstr "Video sisse"
 
 msgid "Call the contact again"
-msgstr "Helista kontaktile uuesti"
+msgstr "Kontaktile uuesti helistamine"
 
 msgid "Camera Off"
-msgstr "Kaamera väljas"
-
-msgid "Camera On"
-msgstr "Kaamera sees"
+msgstr "Kaamera välja"
 
 msgid "Disable camera and stop sending video"
-msgstr "Kaamera keelamine ja video saatmise lõpetamine"
-
-msgid "Enable camera and send video"
-msgstr "Kaamera lubamine ja video saatmine"
-
-msgid "Enable camera but don't send video"
-msgstr "Kaamera lubamine ilma video saatmiseta"
+msgstr "Kaamera väljalülitamine ja video saatmise lõpetamine"
 
 msgid "Preview"
 msgstr "Eelvaade"
 
-msgid "Redial"
-msgstr "Vali uuesti"
-
-msgid "V_ideo"
-msgstr "V_ideo"
-
-msgid "Video Off"
-msgstr "Video väljas"
+msgid "Enable camera but don't send video"
+msgstr "Kaamera sisselülitamine, kuid videot ei saadeta"
 
-msgid "Video On"
-msgstr "Video sees"
+msgid "Camera On"
+msgstr "Kaamera sisse"
 
-msgid "Video Preview"
-msgstr "Video eelvaade"
+msgid "Enable camera and send video"
+msgstr "Kaamera sisselülitamine ja video saatmine"
 
 msgid "Contact Map View"
 msgstr "Kontaktide kaardivaade"
@@ -3324,9 +3272,26 @@ msgstr "Kontaktide kaardivaade"
 msgid "Save"
 msgstr "Salvesta"
 
+msgid "Pastebin link"
+msgstr "Pastebin'i link"
+
+msgid "Pastebin response"
+msgstr "Pastebin'i vastus"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Andmeid on ühe postituse jaoks liiga palju. Palun salvesta oma logid faili."
+
 msgid "Debug Window"
 msgstr "Silumisaken"
 
+msgid "Send to pastebin"
+msgstr "Saada pastebin'i"
+
 msgid "Pause"
 msgstr "Pausi"
 
@@ -3394,9 +3359,6 @@ msgstr "Alguses vali antud konto (nt. gabble/jabber/mingi_40näidis_2eorg0)"
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-msgid "Show account assistant"
-msgstr "Kontoabilise näitamine"
-
 msgid "- Empathy Accounts"
 msgstr "- Empathy kontod"
 
@@ -3475,5 +3437,27 @@ msgstr "Lae kontot"
 msgid "_Match case"
 msgstr "_Tõstutundlik"
 
+msgid "What kind of chat account do you have?"
+msgstr "Mis sorti konto sul on?"
+
 msgid "Adding new account"
 msgstr "Uue konto lisamine"
+
+msgid "People nearby"
+msgstr "Lähedalasuvad inimesed"
+
+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 võib automaatselt avastada samas võrgus asuvad inimesed, et nendega "
+"saaks vestelda. Kui sa tahad seda võimalust, veendu, et all asuvad andmed on "
+"õiged."
+
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"Sa võid üksikasju hiljem muuta või selle võimaluse keelata valides "
+"sõbranimekirjas <span style=\"italic\">Redaktor → Kontod</span>."
diff --git a/po/eu.po b/po/eu.po
index 21fc60df9..c60161845 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,15 +4,15 @@
 # This file is distributed under the same license as the gossip package.
 #
 # Mikel Olasagasti <hey_neken@mundurat.net>, 2003.
-# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 16:22+0200\n"
-"PO-Revision-Date: 2011-09-24 16:17+0200\n"
-"Last-Translator: \n"
-"Language-Team: American English <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2012-03-07 11:23+0100\n"
+"PO-Revision-Date: 2012-03-07 11:29+0100\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
+"Language-Team: American English <itzulpena@euskalgnu.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,27 +41,29 @@ msgstr "Empathy interneteko mezularitza"
 msgid "IM Client"
 msgstr "BM bezeroa"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Mezularitzako eta VoIP-ko kontuak"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Ireki beti berriketa berriak beste leiho batean."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Deiaren bolumena"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Deiaren bolumena (ehunekotan)."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Kameraren gailua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Kameraren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -69,54 +71,60 @@ msgstr ""
 "Karakterea goitizenaren atzean gehitzeko, taldeko berriketan goitizena "
 "osatzea (tabuladorea) erabiltzean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Berriketako leihoaren gaia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Berriketako leihoaren gai aldakorra"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Komaz bereiztu erabiltzea nahi diren hizkuntzen zuzentzaile ortografikoen "
 "zerrenda (adib. \"de, ca, eu\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Trinkotu kontaktu-zerrenda"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Sare-kudeatzaileak erabili beharko lirateke"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Kontaktu-zerrenda ordenatzeko irizpidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Hautatutako azken kontuaren D-Bus objektuaren bide-izena gela batera "
+"elkartzeko."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Kameraren gailu lehenetsia bideo-deiak egiteko. Adib. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Direktorio lehenetsia avatar baten irudia hautatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Desgaitu jakinarazpen-leihoa aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Desgaitu soinuak aldentzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Bistaratu sarrerako gertaerak egoeraren arean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -124,254 +132,261 @@ msgstr ""
 "Bistaratu sarrerako gertaerak egoeraren arean. False (faltsua) bada, "
 "erakutsi hauek erabiltzaileari berehala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Oihartzuna ezeztatzeko euskarria"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "Empathy-k erabiltzailearen kokalekua argitara dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy-k GPSa erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy-k mugikorren sarea erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy-k sarea erabil dezake kokalekua asmatzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Empathy-ren deskargen karpeta lehenetsia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy-k 'butterfly'-ren erregistroak migratu ditu"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Empathy-k automatikoki jarri behar duen 'kanpoan' moduan inaktibo dagoenean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy-k automatikoki konektatu behar duen abiatzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy-k kokalekuaren zehaztasuna gutxiagotu dezake"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa  erabiltzea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Gaitu WebKit garatzaileen tresnak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Gaitu jakinarazpen-leihoak mezu berrientzako"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Gaitu ortografia-egiaztapena"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Ezkutatu leiho nagusia"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Ezkutatu leiho nagusia."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informatu beste erabiltzaileei haiei idazten ari zarenean"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "'Elkartu gelara' elkarrizketa-koadroan hautatutako azken kontua"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Zenbaki magikoa garbiketako atazak exekutatu behar diren begiratzeko"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Goitizena osatzeko karakterea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Ireki berriketa berriak beste leihoetan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Bide-izena Adium gaia erabiltzeko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Bide-izena Adium gaia erabiltzeko (berriketan erabiliko den gaia Adium bada)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Jo soinua mezuak iristean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Jo soinua solasaldi berrietan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Jo soinua mezuak bidaltzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Jo soinua kontaktu batek saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Jo soinua kontaktu batek saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Jo soinua zuk saioa hastean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Jo soinua zuk saioa amaitzean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Jakinarazpen-leihoa berriketak ez badu fokua"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Jakinarazpen-leihoa kontaktu bat konektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Jakinarazpen-leihoa kontaktu bat deskonektatzen denean"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "Kameraren aurrebista zein posiziotan egongo den deian zehar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Erakutsi balantzea kontaktuen zerrendan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Erakutsi avatar-ak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Show contact groups"
+msgstr "Erakutsi kontaktuen taldeak"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show contact list in rooms"
 msgstr "Erakutsi kontaktu-zerrenda geletan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show hint about closing the main window"
 msgstr "Erakutsi leiho nagusia nola ixten den buruzko argibidea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show offline contacts"
 msgstr "Erakutsi konektatu gabeko kontaktuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Show protocols"
 msgstr "Erakutsi protokoloak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Spell checking languages"
 msgstr "Hizkuntzen zuzentzailea"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The default folder to save file transfers in."
 msgstr "Karpeta lehenetsia transferitutako fitxategiak gordetzeko."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Azken direktorioa, Avatar baten irudia aukeratu dena."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The position for the chat window side pane"
 msgstr "Berriketako leihoaren alboko panelaren posizioa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Berriketako leihoaren alboko panelaren gordetako posizioa (pixeletan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Gaia solasaldian bistaratzeko (berriketako leihoan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Gai aldakorra solasaldian bistaratzeko (berriketako leihoetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use graphical smileys"
 msgstr "Erabili aurpegierak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use notification sounds"
 msgstr "Erabili jakinarazpen-soinuak"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Use theme for chat rooms"
 msgstr "Erabili gaia berriketa-gelan"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Empathy-k erabiltzailearen kokalekua bere kontaktuei erakutsiko dien edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko GPSa erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko mugikorren sarea erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy-k kokalekua asmatzeko sarea erabiliko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
-"Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten du."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Empathy abiatzean zure kontuetan saioa automatikoki hasi behar den ala ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Empathy-k 'kanpoan' moduan automatikoki jarriko den erabiltzailea inaktibo "
 "dagoenean."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Arrazoi pribatuak direla eta Empathy-k kokalekuaren zehaztasuna gutxiagotuko "
 "duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Empathy-k berriketako leihoetan kontaktuen avatarrak ikono gisa erakutsi edo "
 "ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Webkit garatzeko tresnak, 'Web Inspector' bezalakoak, gaitu behar diren edo "
 "ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -379,78 +394,86 @@ msgstr ""
 "Automatikoki deskonektatzeko/birkonektatzeko sare-kudeatzailea erabili behar "
 "den edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Idatzitako hitzen zuzenketa ortografikoa landu edo ez (nahi dituzun "
 "hizkuntzetan)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Solasaldietan aurpegierak irudi grafikoetara bihurtuko diren ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 "Pulseaudio-ren oihartzuna ezeztatzeko iragazkia gaitu edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Kontaktuen sareko saio-hasierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Kontaktuen sareko saio-amaierak jakinarazteko soinua joko duen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of events."
 msgstr "Gertaerak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Sarrerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Solasaldi berriak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Irteerako mezuak jakinarazteko soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging into a network."
 msgstr "Sarean saioa hastean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Sareko saioa amaitzean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Kanpoan edo lanpetuta zaudenean soinua joko duen ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"berriketako 'konposatzen' edo 'pausatuta' egoerak bidaliko diren edo ez. Ez "
+"dio 'joanda' egoerari eragiten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Kontaktu bat lineaz kanpo jartzean (deskonektatzean) jakinarazpen-leihoa "
 "erakutsiko duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Kontaktu bat linean jartzean (konektatzean) jakinarazpen-leihoa erakutsiko "
 "duen edo ez."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -459,51 +482,55 @@ msgstr ""
 "adierazten du (nahiz eta berriketa jadanik irekita, baina fokurik gabe, "
 "egon)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Mezu berri bat jasotzean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show account balances in the contact list."
 msgstr ""
 "Kontaktuen zerrendan kontuaren balantzea erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen avatarrak erakutsi "
 "ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Kontaktu-zerrendan deskonektatuak dauden kontaktuak erakutsiko dituen ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether to show groups in the contact list."
+msgstr "Taldeak kontaktuen zerrendan erakutsiko diren edo ez."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Kanpoan edo lanpetuta zaudenean jakinarazpen-leihoa erakutsiko den ala ez "
 "adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Kontaktu-zerrendan eta berriketako leihoetan kontaktuen protokoloak erakutsi "
 "edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Kontaktu-zerrenda berriketa geletan erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the contact list in compact mode."
 msgstr "Kontaktu-zerrenda trinkotuta erakutsi edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -511,47 +538,74 @@ msgstr ""
 "Leiho nagusia titulu-barrako 'x' botoiarekin ixteari buruzko elkarrizketa-"
 "koadroa erakutsi ala ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether to use the theme for chat rooms."
 msgstr "Berriketa-geletan gaia erabili edo ez adierazten du."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Zein irizpide erabiliko den kontaktu-zerrenda ordenatzean. Lehenetsia "
-"kontaktuen izenen arabera ordenatzea da \"name\" (izena) balioarekin. \"state"
-"\" (egoera)balioak kontaktu-zerrenda egoeraren arabera ordenatuko du."
+"kontaktuen egoeren arabera ordenatzea da \"state\" (egoera) balioarekin. "
+"\"name\" (izena) balioak kontaktu-zerrenda izenaren arabera ordenatuko du."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Kudeatu mezularitzako eta VoIP-ko kontuak"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+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."
+msgstr ""
+"'empathy-sanity-cleaning.c'-k  zenbaki hau erabiltzen du "
+"garbiketako atazak exekutatu behar diren edo ez begiratzeko. "
+"Ez da komeni erabiltzaileek gako hau eskuz aldatzea."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Mezularitzako eta VoIP-ko kontuak"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Ez da arrazoirik zehaztu"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Egoeraren aldaketa eskatu da"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Errorea fitxategia transferitzen saiatzean"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Beste partaide batek ezin du fitxategia transferitu"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Arrazoi ezezaguna"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Fitxategi-transferentzia osatuta, baina fitxategia hondatuta dago"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Urruneko kontaktuak ez du fitxategi-transferentziarik onartzen"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Hautatutako fitxategia ez da fitxategi arrunta"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Hautatutako fitxategia hutsik dago"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Galdutako deia %s(e)ndik"
@@ -567,171 +621,140 @@ msgstr "%s(e)k deitu du"
 msgid "Call from %s"
 msgstr "%s(e)tik deia"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Socket mota ez dago onartuta"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Ez da arrazoirik zehaztu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Egoeraren aldaketa eskatu da"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Fitxategi-transferentzia bertan behera utzi duzu"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Beste partaide batek fitxategi-transferentzia bertan behera utzi du"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Errorea fitxategia transferitzen saiatzean"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Beste partaide batek ezin du fitxategia transferitu"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Astiarekin"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Aldendua"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Ikusezina"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Deskonektatuta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ez da arrazoirik zehaztu"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Egoera lineaz kanpo gisa ezarri da"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Sareko errorea"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentifikazioak huts egin du"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Enkriptazioaren errorea"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Izena erabilita"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Ez da ziurtagiririk eman"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Ziurtagiria ez da fidagarria"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Ziurtagiria iraungituta"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Ziurtagiria aktibatu gabe"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Ziurtagiriaren ostalari-izena ez dator bat"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Ziurtagiriaren hatz-marka ez dator bat"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Ziurtagiria bere buruarekin sinatuta"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Ziurtagiriaren errorea"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Enkriptatzea ez dago erabilgarri"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Ziurtagiria baliogabea da"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Konexioa ukatu egin da"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Konexioa ezin da ezarri"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Konexioa galdu egin da"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Baliabidea jadanik zerbitzariarekin konektatuta dago"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Kontu hau jadanik zerbitzariarekin konektatuta dago"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Konexioa ordeztu egin da baliabide berdina darabilen konexio berri batekin"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Zerbitzaria oso lanpetuegia dago konexioa kudeatzeko"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Ziurtagiria errebokatu egin da"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Ziurtagiriak zifratzeko algoritmo ez-segurua darabil, edo kriptografikoki "
 "ahula da"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -739,165 +762,144 @@ msgstr ""
 "Zerbitzariaren ziurtagiriaren luzerak, edo zerbitzariaren ziurtagiriaren "
 "katearen sakonerak, liburutegi kriptografikoak ezartzen duen muga gainditu du"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Darabilzun softwarea zaharregia da"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Barneko errorea"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Inguruko jendea"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Japoniako Yahoo!"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook berriketa"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "Duela segundo %d"
 msgstr[1] "Duela %d segundo"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "Duela minutu %d"
 msgstr[1] "Duela %d minutu"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "Duela ordu %d"
 msgstr[1] "Duela %d ordu"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "Duela egun %d"
 msgstr[1] "Duela %d egun"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "Duela aste %d"
 msgstr[1] "Duela %d aste"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "Duela hilabete %d"
 msgstr[1] "Duela %d hilabete"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "etorkizunean"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Kontu guztiak"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Ataka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Nire Web Kontuak"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s kontua '%s' bidez editatu da."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s kontua ezin da Empathy-n editatu."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Abiarazi 'Nire Web Kontuak'"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Editatu %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Aplikatu"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Saio-hasiera"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Kontu hau badago lehendik ere zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Sortu kontu berria zerbitzarian"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Utzi"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s - %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s kontua"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Kontu berria"
 
@@ -945,7 +947,7 @@ msgstr "Gogoratu pasahitza"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Gogoratu pasahitza"
 
@@ -1271,7 +1273,7 @@ msgid "STUN Server:"
 msgstr "STUN zerbitzaria:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
@@ -1352,61 +1354,65 @@ msgstr "Fitxategi denak"
 msgid "Click to enlarge"
 msgstr "Egin klik handitzeko"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Errore bat gertatu da deia hastean"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Zehaztutako kontaktuak ez dauka deien euskarririk"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Zehaztutako kontaktua lineaz kanpo dago."
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Zehaztutako kontaktua ez da baliozkoa"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Protokolo honek ez du larrialdietarako deirik onartzen"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Ez daukazu nahikoa krediturik dei hau egiteko"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Huts egin du berriketa pribatua irekitzean"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Gaia ez dago onartuta solasaldi honetan"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Ez duzu baimenik gaia aldatzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "'%s' ez da baliozko IDa"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: mezu guztiak garbitzen ditu uneko solasaldian"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <gaia>: ezarri uneko solasaldiaren gaia"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <berriketa-gelaren IDa>: elkartu berriketa-gela berri batekin"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1414,23 +1420,23 @@ msgstr ""
 "/part [<berriketa-gelaren IDa>] [<arrazoia>]: utzi berriketa-gela, lehenetsi "
 "gisa unekoa"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktuaren IDa> [<mezua>]: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktuaren IDa> <mezua>: ireki berriketa pribatu bat"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <goitizena>: aldatu zure goitizena uneko zerbitzarian"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mezua>: bidali ekintzaren mezua uneko solasaldira"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1440,11 +1446,11 @@ msgstr ""
 "karakterearekin hasten diren mezuak bidaltzeko erabiltzen da. Adibidez, \"/"
 "say /join berriketa-gela berri batekin elkartzeko erabiltzen da\""
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontaktuaren IDa>: bistaratu kontaktuari buruzko informazioa"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1452,113 +1458,128 @@ msgstr ""
 "/help [<komandoa>]: erakutsi onartutako komando guztiak. <komandoa> "
 "definitzen bada, nola erabiltzen den erakusten du."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Erabilera: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Komando ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Komando ezezaguna; ikus /help komando erabilgarrientzako"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ez dago nahikoa balantzerik mezua bidaltzeko"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Errorea '%s' mezua bidaltzean: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Errorea mezua bidaltzean: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"ez dago nahikoa balantzerik mezua bidaltzeko. <a href='%s'>Berriro kargatu</"
+"a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ez da gai"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "lineaz kanpo"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "kontaktu baliogabea"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "mezua luzeegia"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "inplementatu gabe"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Errorea '%s' mezua bidaltzean: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Errorea mezua bidaltzean: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Gaia:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Gaia honela ezarria: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s(e)k gaia honela ezarri du: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Ez da gairik definitu"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Iradokizunik ez)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Gehitu '%s' hiztegiari"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Gehitu '%s' '%s' hiztegiari"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Txertatu aurpegiera"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Bidali"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Iradokizun _ortografikoak"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Huts egin du azken erregistroak eskuratzean"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s deskonektatu egin da"
@@ -1566,12 +1587,12 @@ msgstr "%s deskonektatu egin da"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s(e)k %1$s kanporatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kanporatua izan da"
@@ -1579,17 +1600,17 @@ msgstr "%s kanporatua izan da"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s(e)k %1$s debekatu du"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s debekatua izan da"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s(e)k gela utzi du"
@@ -1599,17 +1620,17 @@ msgstr "%s(e)k gela utzi du"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s(e)k gelara elkartzea nahi du"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s orain honela ezagutzen da: %s"
@@ -1617,88 +1638,88 @@ msgstr "%s orain honela ezagutzen da: %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:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Deskonektatuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Pasahitz hau gordetzea nahi duzu?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Gogoratu"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Orain ez"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Saiatu berriro"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Okerreko pasahitza, saiatu berriro:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Gela hau pasahitz batekin babestuta dago:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Elkartu"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Solasaldia"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Identifikatzaile ezezaguna edo baliogabea"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktuen blokeoa ez dago erabilgarri aldi baterako"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Kontaktuen blokeoa ez dago erabilgarri"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Baimena ukatuta"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Ezin izan da kontaktua blokeatu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Editatu blokeatutako kontaktuak"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1710,64 +1731,55 @@ msgstr "Blokeatutako kontaktuak"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Kendu"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopiatu estekaren helbidea"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Ireki esteka"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A, %Y %B %d"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Editatu kontaktuaren informazioa"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informazio pertsonala"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Kontaktu berria"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokeatu %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
 "Ziur zaude '%s' blokeatzea nahi duzula zurekin berriro harremanetan ez "
 "jartzeko?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokeatu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Salatu kontaktu hau iraingarri gisa"
@@ -1785,349 +1797,268 @@ msgstr "Harpidetza eskaera"
 msgid "_Block User"
 msgstr "_Blokeatu erabiltzailea"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Banatuta"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Gogoko jendea"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Taldea kentzen"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Kendu"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Kontaktua kentzen"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Gehitu _kontaktua..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokeatu kontaktua"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Berriketa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio-deia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Bideo-deia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Aurreko solasaldiak"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Bidali fitxategia"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Partekatu nire mahaigaina"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Gogokoa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Informazioa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Editatu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Gela honetara gonbidatzen zaituzte"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Gonbidatu berriketa-gelara"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Bilatu kontaktuak"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Bilatu: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Gehitu kontaktua"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Ez da kontakturik aurkitu"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Zure mezua zeure burua aurkeztuz:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Utzidazu ikusten linean zaudenean. Mila esker."
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Hautatu kontaktua"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Izen osoa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefono zenbakia:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Helbide elektronikoa:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Webgunea:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Urtebetetzea:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Ikusi zen azken aldia:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Hemendik konektatuta:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Kanpoan nagoeneko mezua:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanalak:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Herrialdearen ISO kodea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Herrialdea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Estatua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Herria:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Posta-kodea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Kalea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Eraikuntza:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Solairua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Testua:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URIa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Zehaztasun maila:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Errorea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Errore bertikala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Errore horizontala (metroak):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Atzerapena:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Igoerako abiadura:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Azken eguneraketa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitudea:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Kokalekua"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y/%B/%e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Gorde avatar-a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ezin da avatar-a gorde"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Xehetasun pertsonalak"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Kontaktuaren xehetasunak"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Izen-deiturak"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefono-zenbakia"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Helbide elektronikoa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Webgunea"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Urtebetetzea"
+
+#. 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 "Ikusi zen azken aldia:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Hemendik konektatuta:"
+
+#. 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 "Kanpoan nagoeneko mezua:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "lana"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "etxea"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mugikorra"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "ahotsa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "hobetsia"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "posta"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "taldea"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Kokalekua</b> (data)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Aliasa:"
 
@@ -2139,15 +2070,10 @@ msgstr "Bezeroaren informazioa"
 msgid "Client:"
 msgstr "Bezeroa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Kontaktuaren xehetasunak"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikatzailea:"
 
@@ -2164,11 +2090,11 @@ msgstr "SE:"
 msgid "Version:"
 msgstr "Bertsioa:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Taldeak"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2176,105 +2102,170 @@ msgstr ""
 "Hautatu taldeak kontaktu hau talde horietan azaltzeko, talde bat baino "
 "gehiago hauta ditzakezu, edo talderik ez."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Gehitu taldea"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Taldea"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Honako identitatea blokeatu egingo da:"
 msgstr[1] "Honako identitateak blokeatu egingo dira:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Honako identitatea ezingo da blokeatu:"
 msgstr[1] "Honako identitateak ezingo dira blokeatu:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Estekatutako kontaktuak"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Hautatu kontaktuak estekatzeko"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Kontaktu berriaren aurrebista"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ezkerreko zerrendan hautatutako kontaktuak elkarrekin estekatuko dira."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Editatu kontaktuaren informazioa"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Hautatu kontua deia egitean erabiltzeko"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Deitu"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mugikorra"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Lana"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Etxea"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokeatu kontaktua"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_Berriketa"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio-deia"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Bideo-deia"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "_Aurreko solasaldiak"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Bidali fitxategia"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Partekatu nire mahaigaina"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Gogokoa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ez dago instalatuta"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalatu gnome-contacts kontaktuen xehetasunak atzitzeko."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Informazioa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editatu"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Konektatu kontaktuak..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Gela honetara gonbidatzen zaituzte"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Gonbidatu berriketa-gelara"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "Gehitu _kontaktua..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Ezabatu eta _blokeatu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Ziur zaude '%s' taldea kentzea nahi duzula?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Taldea kentzen"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Kendu"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Ziur zaude '%s' kontaktua kendu nahi duzula?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2284,7 +2275,11 @@ msgstr ""
 "estekatutako kontaktu hau osatzen dituzten kontaktu guztiak ezabatuko "
 "dituela."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Kontaktua kentzen"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2299,19 +2294,19 @@ msgstr "<b>Kokalekua</b> (data)"
 msgid "Online from a phone or mobile device"
 msgstr "Linean telefono edo mugikor gailu batetik"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Sare berria"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Aukeratu IRC sarea"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Berrezarri _sareen zerrenda"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Hautatu"
@@ -2324,181 +2319,136 @@ msgstr "zerbitzari berria"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Konektatu kontaktuak"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Deskonektatu..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Bistaratuta dauden estekatutako kontaktuak erabat zatitu bereiztutako "
-"kontaktuetan."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Konektatu"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desestekatu estekatutako '%s' kontaktuak?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Ziur zaude estekatutako kontaktu hauek desestekatzea nahi duzula? Honek "
-"erabat zatituko ditu estekatutako kontaktuak bereiztutako kontaktuetan."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Deskonektatu"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Erakutsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "%s(e)n berriketan"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s(r)ekin berriketan"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %Y/%B/%e %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "segundo %s"
 msgstr[1] "%s segundo"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "minutu %s"
 msgstr[1] "%s minutu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Deiaren iraupena: %s; amaiera: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Gaur"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y %B %e"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Edozer ordu"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Edozein"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Nor"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Noiz"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Edozer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Testuzko berriketak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Sarrerako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Irteerako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Galdutako deiak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Zer"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Ziur zaude aurreko berriketetako egunkari guztiak ezabatzea nahi dituzula?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Garbitu denak"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Ezabatu hemendik:"
 
@@ -2527,7 +2477,7 @@ msgstr "Bideoa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Editatu"
 
@@ -2539,36 +2489,82 @@ msgstr "_Fitxategia"
 msgid "page 2"
 msgstr "2. orrialdea"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontaktuaren IDa:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontaktua lineaz kanpo dago"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Zehaztutako kontaktua ez da baliozkoa edo ezezaguna da"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Berriketa"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontaktua ez dago onartuta berriketa mota honetan"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Eskatutako funtzionalitatea ez dago protokolo honentzako garatuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ezin izan da emandako kontaktuarekin berriketa hasi "
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Kanal honetan debekua ezarri dizute"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanal hau beteta dago"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Kanal honetara elkartzeko gonbidatua izan zara"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ezin da aurrera jarraitu deskonektatuta dagoen bitartean"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Baimena ukatuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Errorea gertatu da berriketa hastean"
+
+#: ../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 "Sartu kontaktuaren identifikatzailea edo telefono-zenbakia:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Solasaldi berria"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Bidali _bideoa"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Bideo-deia"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Deitu"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio-deia"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Dei berria"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<b>%s</b> kontuaren autentifikazioak huts egin du"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2605,12 +2601,8 @@ msgstr "Egin klik egoera hau gogoko bihurtzeko"
 msgid "Set status"
 msgstr "Ezarri egoera"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Ezarri zure presentzia eta uneko egoera"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Mezu pertsonalizatuak..."
 
@@ -2618,7 +2610,7 @@ msgstr "Mezu pertsonalizatuak..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "%s kontu berria"
@@ -2687,12 +2679,12 @@ msgstr "Ahots-deia amaituta"
 msgid "Edit Custom Messages"
 msgstr "Editatu mezu pertsonalizatuak"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mezua noiz editatuta: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Arrunta"
 
@@ -2771,34 +2763,38 @@ msgid "Certificate hostname: %s"
 msgstr "Ziurtagiriaren ostalari-izena: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Jarraitu"
+msgid "C_ontinue"
+msgstr "_Jarraitu"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Konexio ez-fidagarria"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Konexio hau ez da fidagarria. Hala ere, jarraitzea nahi duzu?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Gogoratu aukera hau etorkizuneko konexioetan"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Ziurtagiriaren xehetasunak"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Ezin da URIa ireki"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Ez dago nahikoa lekurik fitxategia gordetzeko"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2807,7 +2803,7 @@ msgstr ""
 "%s-tako leku librea behar da fitxategi hau gordetzeko, soilik %s dago ordea "
 "erabilgarri. Aukeratu beste kokaleku bat."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Sarrerako fitxategia %s(e)ndik"
@@ -2979,40 +2975,32 @@ msgstr "Mendebaldekoa"
 msgid "Vietnamese"
 msgstr "Vietnamera"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Hautatutako kontaktuak ezin du fitxategirik jaso"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Hautatutako kontaktua lineaz kanpo dago."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ez dago errorearen mezurik"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Berehalako mezularitza (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ez konektatu abiatzean"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ez bistaratu kontaktu-zerrenda edo bestelako elkarrizketa-koadrorik abiatzean"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy BM bezeroa"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Errorea kontu-kudeatzailearekin kontaktatzean"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3058,233 +3046,93 @@ msgstr ""
 "jasoko zenuen; hala ez bada, idatzi hona: Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Berehalako mezularitzako bezero bat GNOMErako"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Errore bat gertatu da kontuak inportatzean."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Errore bat gertatu da kontuaren xehetasunak analizatzean."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Errore bat gertatu da kontua sortzean."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Errore bat gertatu da."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Errorearen mezua: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Atzera joan eta kontuko xehetasunak berriro sartzen saia zintezke, edo "
-"morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Errore bat gertatu da"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Zein motako berriketa-kontua duzu?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Sartu kontuaren xehetasunak"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Sartu kontu berriaren xehetasunak"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Google Talk, AIM, Windows Live eta beste berriketako programak darabilten "
-"inguruko jendearekin, lagunekin eta lankideekin berriketan egin dezakezu "
-"Empathy-rekin. Mikrofono edo web kamera batekin audio- edo bideo-deiak egin "
-"ditzakezu."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ez, kontu berri bat nahi dut"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Hautatu inportatzea nahi dituzun kontuak:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Bai"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ez, hau izan da guztia"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
-"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
-"egiaztatu azpiko xehetasunak zuzenak direla. Xehetasun hauek beranduago "
-"erraz alda ditzakezu (edo eginbide hau desgaitu) 'Kontuak' elkarrizketa-"
-"koadroa erabiliz."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Editatu->Kontuak"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Oraingoz _ez dut eginbide hau gaitzerik nahi"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ezin izango duzu berriketan egin zure sare lokaleko beste erabiltzaileekin, "
-"telepathy-salut ez baitago instalatuta. Eginbide hau gaitzea nahi izanez "
-"gero, instalatu telepathy-salut paketea eta sortu 'Inguruko jendea' kontu "
-"bat 'Kontuak' elkarrizketa-koadroan."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ez dago instalatuta"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Mezularitzako eta VoIP-ko kontuaren laguntzailea"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Ongietorri Empathy-ra"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Inportatu dauzkazun kontuak"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Sartu xehetasun pertsonalak"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Gorde gabeko eraldaketak daude zure %s kontuan."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Zure kontu berria oraindik gorde gabe dago."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Konektatzen..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Lineaz kanpo — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Deskonektatuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Lineaz kanpo — Ez dago sareko konexiorik"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Egoera ezezaguna"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Kontu hau desgaitu egin da zaharkitutako eta onartu gabeko motorrean "
+"oinarritzen delako. Instalatu telepathy-haze eta berrabiarazi zure saioa "
+"kontua migratzeko."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Lineaz kanpo — Kontua desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
-"aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Editatu konexioaren parametroak"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Huts egin du zure informazio pertsonala zerbitzaritik eskuratzean."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Jar zaitez linean zure informazio pertsonala editatzeko."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Editatu konexioaren parametroak..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ziur zaude '%s' kentzea nahi duzula ordenagailutik?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Honek ez du zure kontua zerbitzaritik kenduko."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3293,15 +3141,23 @@ msgstr ""
 "aldaketak baztertu egingo dira Ziur zaude jarraitzea nahi duzula?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Gaituta"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Desgaituta"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Saltatu"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Konektatu"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3318,14 +3174,10 @@ msgid "Loading account information"
 msgstr "Kontaktuaren informazioa kargatzen"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ez da protokolorik instalatu"
+msgid "No protocol backends installed"
+msgstr "Ez da protokoloen motorrik instalatu"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoloa:"
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3333,132 +3185,116 @@ msgstr ""
 "Kontu berri bat gehitzeko, aurrenik erabiltzea nahi duzun protokolo "
 "bakoitzaren motorra instalatu behar duzu."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Inportatu..."
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy-ren autentifikazio-bezeroa"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Inguruko jendea"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy-ren audio/bideo bezeroa"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrastea"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Distira"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Bolumena"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Albo-barra"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Audio-sarrera"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Bideo-sarrera"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Dei-teklatua"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Xehetasunak"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Deitu honekin: %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Makinak IP helbidea ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP helbidea interneteko zerbitzari batek ikusi du"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Parekoaren IP helbidea bestaldean ikusi da"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Transmisioko ('relay') zerbitzariaren IP helbidea"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Multidifusioko taldearen IP helbidea"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Konektatuta — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Xehetasun teknikoak"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3467,8 +3303,8 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen audio-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3477,8 +3313,8 @@ msgstr ""
 "%s(r)en softwareak ez du ulertzen zure ordenagailuak onartzen dituen bideo-"
 "formatuak"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3487,29 +3323,29 @@ msgstr ""
 "Ezin da konexiorik ezarri %s(r)ekin. Zuetako bat zuzeneko konexioak "
 "baimentzen ez dituen sare batean dago."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Hutsegite bat egon da sarean"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren audio-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Dei hau egiteko beharrezkoak diren bideo-formatuak instalatu gabe daude "
 "ordenagailuan"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3520,23 +3356,23 @@ msgstr ""
 "genizuke <a href=\"%s\">akats honen berri emango bazenu</a> eta Laguntza "
 "menuko 'Araztu' leihotik eskuratutako erregistroak erantsiko bazenio."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Hutsegite bat gertatu da deiaren motorrean"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Korrontearen amaierara iritsi da"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ezin da audioaren korrontea ezarri"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ezin da bideoaren korrontea ezarri"
 
@@ -3627,8 +3463,8 @@ msgstr "Txandakatu bideoaren igorpena"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -3646,17 +3482,17 @@ msgid "_Camera"
 msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Edukia"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Araztu"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "_Laguntza"
 
@@ -3669,51 +3505,99 @@ msgid "_Settings"
 msgstr "_Ezarpenak"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Itxi leiho hau?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Leiho hau ixtean %s utziko da. Ez duzu mezu gehiago jasoko berriro elkartu "
+"arte."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Leiho hau ixtean berriketa-gela utziko da. Ez duzu mezu gehiago jasoko "
+"berriro elkartu arte."
+msgstr[1] ""
+"Leiho hau ixtean %u berriketa-gela utziko dira. Ez duzu mezu gehiago jasoko "
+"haietara berriro elkartu arte."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Utzi %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Ez duzu berriketa-gela honetatik mezu gehiago jasoko berriro elkartu arte."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Itxi leihoa"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Irten gelatik"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d irakurri gabe)"
 msgstr[1] "%s (%d irakurri gabe)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (eta beste %u)"
 msgstr[1] "%s (eta beste %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d irakurri gabe besteengandik)"
 msgstr[1] "%s (%d irakurri gabe besteengandik)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d irakurri gabe guztietatik)"
 msgstr[1] "%s (%d irakurri gabe guztietatik)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Mezu %d bidaltzen"
 msgstr[1] "%d mezu bidaltzen"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Mezua idazten."
 
@@ -3793,96 +3677,96 @@ msgstr "Konektatu automatikoki"
 msgid "Manage Favorite Rooms"
 msgstr "Kudeatu gogoko gelak"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Sarrerako bideo-deia"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Sarrerako deia"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s bideoz deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s deitzen ari zaizu. Nahi duzu erantzutea?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Sarrerako deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Ez ona_rtu"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Erantzun"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Erantzun bideoarekin"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Sarrerako bideoko deia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Gelarako gonbitea"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbitea"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s(e)k gonbidatzen zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Elkartu"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s(e)k gonbidatu zaitu '%s'(e)ra elkartzeko"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "'%s'(e)ra elkartzeko gonbidatua izan zara"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Sarrerako fitxategi-transferentzia %s-(e)ndik"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Pasahitza behar da"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s(e)k baimena eskatzen du zu linean noiz zauden ikusteko"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3892,105 +3776,105 @@ msgstr ""
 "Mezua: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s (%s/s)"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" hemendik jasotzen: %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" honi bidaltzen: %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errorea \"%s\" hemendik jasotzean: %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Errorea fitxategi bat jasotzean"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errorea \"%s\" honi bidaltzean: %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Errorea fitxategi bat bidaltzean"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" hemendik jasota: %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" honi bidalita: %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Fitxategi-transferentzia osatuta"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Beste partaideen erantzunaren zai"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\"(r)en osotasuna egiaztatzen"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\"(r)en hash-a egiten"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fitxategia"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Falta:"
 
@@ -4004,7 +3888,11 @@ msgstr ""
 "Kendu osatutako, bertan behera utzitako eta huts egindako fitxategi-"
 "transferentziak zerrendatik"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Inportatu"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4012,171 +3900,195 @@ msgstr ""
 "Ez da inportatzeko konturik aurkitu. Empathy-k oraingoz Pidgin-etik soilik "
 "inporta ditzake kontuak."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Inportatu kontuak"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Inportatu"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Iturburua"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Eman pasahitza"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Deskonektatu"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Kontu bat konfiguratu behar duzu.kontaktuak hemen ikusteko."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ez da bat datorrenik aurkitu"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "Ezin da %s kontua erabili %s softwarea eguneratu arte."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Eguneratu softwarea..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Itxi"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Berriz konektatu"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editatu kontua"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Itxi"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Berriro kargatu %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Berriro kargatu kontuaren kreditua"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Berriro kargatu..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Zure kontuetariko bat gaitu behar duzu kontaktuak hemen ikusteko."
+
+#. 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 "%s gaitu behar duzu kontaktuak hemen ikusteko."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktuen zerrenda"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontuaren ezarpenak"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Kontaktuak _mapa batean"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Kredituaren balantzea"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Bilatu kontaktuen _zerrendan"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Elkartu _gogokoetan"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Kudeatu gogokoak"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Tamaina _normala"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Dei _berria..."
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Tamaina normala _avatarrekin"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "_Hobespenak"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Erakutsi p_rotokoloak"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordenatu _izenarekiko"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordenatu _egoerarekiko"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Kontuak"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokeatutako kontaktuak"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "Tamaina _trinkoa"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "_Fitxategi-transferentziak"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Elkartu..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Solasaldi berria..."
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "_Konektatu gabeko kontaktuak"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Informazio pertsonala"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_Gela"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Bilatu kontaktuak..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Berriketa-gela"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Kideak"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4189,16 +4101,21 @@ msgstr ""
 "Pasahitza behar da: %s\n"
 "Kideak: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Bai"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ez"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ezin izan da gelen zerrenda abiarazi"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ezin izan da gelen zerrenda gelditu"
 
@@ -4233,79 +4150,79 @@ msgstr "Gelen zerrenda"
 msgid "_Room:"
 msgstr "_Gela:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mezua jasota"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Mezua bidalita"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Solasaldi berria"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Kontaktua linean dago"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Kontaktua konektatu da "
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontaktua lineaz kanpo dago"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Kontua konektatuta"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Kontua deskonektatuta"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Hizkuntza"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, non zaude ez zaitudala ikusten Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Ukatu aita, ukatu izena ere;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Edo, ez baduzu nahi, zin egin maite nauzula"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Eta ez naiz gehiago Capuletar bat izango."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Gehiago entzun behar dut, edo erantzun dezaket?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta deskonektatu egin da"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Hobespenak"
 
@@ -4365,35 +4282,27 @@ msgstr "Gaitu hizkuntzen zuzentzailea:"
 msgid "General"
 msgstr "Orokorra"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Sarrerako maila:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Sarrerako bolumena:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "Kokalekuaren iturburuak:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Erregistratu solasaldiak"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Jo soinua gertaeretan"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Pribatutasuna"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4403,32 +4312,40 @@ msgstr ""
 "soilik argitaratuko dela adierazten du. GPS koordenatuak dezimal 1eko "
 "zehaztasuna edukiko du."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Erakutsi _aurpegierak irudi gisa"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Erakutsi kontaktu-_zerrenda geletan"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Soinuak"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Zuzentzailea"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Hasi berriketa hemen:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Hizkuntzen zerrendak instalatutako hiztegiei soilik dagokie."
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Gaiak"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Erabili _oihartzunaren ezeztapena deiaren kalitatea hobetzeko"
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Aldaera:"
@@ -4458,18 +4375,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_Sarea (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Ireki berriketa berriak beste leihoetan"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "_Erakutsi kokalekua nire kontaktuei"
 
 #. 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:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Murriztu kokalekuaren zehaztasuna"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "_leiho berriak"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_fitxa berriak"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Egoera"
@@ -4526,201 +4447,525 @@ msgstr "Piztu bideoa"
 msgid "Video Preview"
 msgstr "Bideoaren aurrebista"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktuen maparen ikuspegia"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Gorde"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin-en esteka"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin-en erantzuna"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datuak luzeegiak dira bat batean itsasteko. Gorde erregistroak fitxategian."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Arazketa-leihoa"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Bidali pastebin-era"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausatu"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Maila: "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Arazketa"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informazioa"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Abisua"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritikoa"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Errorea"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Ordua"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domeinua"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Maila"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Hautatutako konexio-kudeatzaileak ez du urruneko arazketa-hedapenik onartzen."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Gonbidatu partaidea"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Aukeratu kontaktua solasaldira gonbidatzeko:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Gonbidatu"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ez bistaratu inolako elkarrizketa-koadrorik. Landu eginbeharrekoak (adib. "
 "inportatzea) eta irten"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ez bistaratu inolako elkarrizketa-koadrorik \"Inguruko jendea\" kontuak "
 "soilik egon arte"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Hasieran hautatu emandako kontua (adib. gabble/jabber/foo_40adibidea_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<kontuaren-IDa>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy kontuak"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy kontuak"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Erakutsi zerbitzu berezi bat"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy araztailea"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy araztailea"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy berriketarako bezeroa"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Erantzun"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Baztertu"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Erantzun"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Erantzun bideoarekin"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Ukatu"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Onartu"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Eman"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s(e)k zuri deitzen saiatu da, baina beste dei batean zeunden."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Itxaron"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Mututu"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Iraupena"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Zure uneko balantzea: %s"
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Ez daukazu nahikoa krediturik dei hori egiteko."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Berriro kargatu..."
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Maiuskula/minuskula"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Zein motako berriketa-kontua duzu?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Kontu berria gehitzea"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Inguruko jendea"
+
+#: ../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."
+msgstr ""
+"Zu zauden sarean konektatutako beste erabiltzaileekin automatikoki aurkitu "
+"eta berriketan egin dezake Empathy-k. Eginbide hau erabiltzea nahi baduzu, "
+"egiaztatu azpiko xehetasunak zuzenak direla."
+
+#: ../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 ""
+"Xehetasun hauek beranduago alda ditzakezu edo funtzionalitate hau desgaitu "
+"kontaktuen zerrendan <span style=\"italic\">Editatu → Kontuak</span> "
+"aukeratuz."
+
+#~ msgid "Call volume"
+#~ msgstr "Deiaren bolumena"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Deiaren bolumena (ehunekotan)."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy-k 'butterfly'-ren erregistroak migratu ditu"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr ""
+#~ "Empathy-k 'butterfly'-ren erregistroak migratu dituen ala ez adierazten "
+#~ "du."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Socket mota ez dago onartuta"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Nire Web Kontuak"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s kontua '%s' bidez editatu da."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s kontua ezin da Empathy-n editatu."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Abiarazi 'Nire Web Kontuak'"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editatu %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Utzi"
+
+#~ msgid "Personal Information"
+#~ msgstr "Informazio pertsonala"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Banatuta"
+
+#~ msgid "Favorite People"
+#~ msgstr "Gogoko jendea"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Editatu"
+
+#~ msgid "Select a contact"
+#~ msgstr "Hautatu kontaktua"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Estekatutako kontaktuak"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Hautatu kontaktuak estekatzeko"
+
+#~ msgid "New contact preview"
+#~ msgstr "Kontaktu berriaren aurrebista"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Ezkerreko zerrendan hautatutako kontaktuak elkarrekin estekatuko dira."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Konektatu kontaktuak..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Konektatu kontaktuak"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Deskonektatu..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Bistaratuta dauden estekatutako kontaktuak erabat zatitu bereiztutako "
+#~ "kontaktuetan."
+
+#~ msgid "_Link"
+#~ msgstr "_Konektatu"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desestekatu estekatutako '%s' kontaktuak?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Ziur zaude estekatutako kontaktu hauek desestekatzea nahi duzula? Honek "
+#~ "erabat zatituko ditu estekatutako kontaktuak bereiztutako kontaktuetan."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Deskonektatu"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontaktuaren IDa:"
+
+#~ msgid "C_hat"
+#~ msgstr "_Berriketa"
+
+#~ msgid "Send _Video"
+#~ msgstr "Bidali _bideoa"
+
+#~ msgid "C_all"
+#~ msgstr "_Deitu"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Ezarri zure presentzia eta uneko egoera"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Hautatutako kontaktuak ezin du fitxategirik jaso"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Hautatutako kontaktua lineaz kanpo dago."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Errore bat gertatu da kontuak inportatzean."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Errore bat gertatu da kontuaren xehetasunak analizatzean."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Errore bat gertatu da kontua sortzean."
+
+#~ msgid "There was an error."
+#~ msgstr "Errore bat gertatu da."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Errorearen mezua: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Atzera joan eta kontuko xehetasunak berriro sartzen saia zintezke, edo "
+#~ "morroi honetatik irten eta kontuak geroago gehitu Editatu menuan."
+
+#~ msgid "An error occurred"
+#~ msgstr "Errore bat gertatu da"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Baduzu beste berriketako konturik konfiguratzeko?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Sartu kontuaren xehetasunak"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Zein motako berriketako kontua sortzea nahi duzu?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Nahi duzu beste berriketako kontu bat sortzea?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Sartu kontu berriaren xehetasunak"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Google Talk, AIM, Windows Live eta beste berriketako programak darabilten "
+#~ "inguruko jendearekin, lagunekin eta lankideekin berriketan egin dezakezu "
+#~ "Empathy-rekin. Mikrofono edo web kamera batekin audio- edo bideo-deiak "
+#~ "egin ditzakezu."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Beste berriketako programa batean erabiltzen duzun konturik baduzu?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Bai, inportatu nire kontuko xehetasunak hemendik: "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Bai, orain sartuko dut nire kontuko xehetasunak"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ez, kontu berri bat nahi dut"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ez, oraingoz inguruko konektatutako jendea ikustea nahi dut"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Hautatu inportatzea nahi dituzun kontuak:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ez, hau izan da guztia"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editatu->Kontuak"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Oraingoz _ez dut eginbide hau gaitzerik nahi"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ezin izango duzu berriketan egin zure sare lokaleko beste "
+#~ "erabiltzaileekin, telepathy-salut ez baitago instalatuta. Eginbide hau "
+#~ "gaitzea nahi izanez gero, instalatu telepathy-salut paketea eta sortu "
+#~ "'Inguruko jendea' kontu bat 'Kontuak' elkarrizketa-koadroan."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Mezularitzako eta VoIP-ko kontuaren laguntzailea"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Ongietorri Empathy-ra"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Inportatu dauzkazun kontuak"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Sartu xehetasun pertsonalak"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Kontu berri bat sortzera zoaz, eta ondorioz zuk egindako\n"
+#~ "aldaketak baztertu egingo dira. Ziur zaude jarraitzea nahi duzula?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoloa:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ezezaguna"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Informazio pertsonala"
+
+#~ msgid "Input level:"
+#~ msgstr "Sarrerako maila:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Sarrerako bolumena:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Ireki berriketa berriak beste leihoetan"
+
 #~ msgid "All"
 #~ msgstr "Denak"
 
diff --git a/po/fi.po b/po/fi.po
index 45eb54680..718756f07 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,518 +9,516 @@
 # Timo Jyrinki https://launchpad.net/~timo-jyrinki
 # Tommi Saira https://launchpad.net/~tommisaira
 # Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2010.
+# Gnome 2012-03 Finnish translation sprint participants:
+# Jiri Grönroos
+# Niklas Laxström
+# Timo Jyrinki
 msgid ""
 msgstr ""
+""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 13:41+0300\n"
-"PO-Revision-Date: 2011-09-08 13:41+0300\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-02 10:35+0000\n"
+"PO-Revision-Date: 2012-03-12 08:36:45+0000\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 2012-03-05 15:05:34+0000\n"
+"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-03-02\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Keskustele käyttäen Google Talkia, Facebookia, MSN:ää ja monia muita "
-"palveluja"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "pikaviestin"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy-pikaviestin"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "pikaviestin"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Keskustele käyttäen Google Talkia, Facebookia, MSN:ää ja monia muita palveluja"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Viestintä ja VoIP-käyttäjätilit"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Hallitse viestimiä ja Internet-puheluiden (VoIP) käyttäjätilejä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
+msgid "Connection managers should be used"
+msgstr "Yhteyden hallintaohjelmia tulisi käyttää"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Puhelun äänenvoimakkuus"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Käyttääkö Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen luomiseen ja katkaisuun."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Puhelun äänenvoimakkuus prosentteina."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy yrittää yhdistää automaattisesti käynnistettäessä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kamera"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Kirjautuuko Empathy tileillesi automaattisesti käynnistymisensä yhteydessä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kameran sijainti"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathyn tulisi merkitä automaattisesti poissaolevaksi, mikäli konetta ei käytetä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Lempinimen jälkeen lisättävä merkki, kun käytetään lempinimen täydennystä "
-"(sarkain) ryhmäkeskustelussa."
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Tulisiko Empathyn merkitä käyttäjä automaattisesti poissaolevaksi, mikäli konetta ei käytetä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Keskusteluikkunan teema"
+msgid "Empathy default download folder"
+msgstr "Empathyn noutojen oletuskansio"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Keskusteluikkunan teemamuunnos"
+msgid "The default folder to save file transfers in."
+msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman käyttämistä "
-"kielistä (esim. \"fi, en, fr\")."
+msgid "Show offline contacts"
+msgstr "Näytä linjoilta poissa olevat tuttavat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Pienikokoinen tuttavaluettelo"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Näytetäänkö poissa linjoilta olevat tuttavat tuttavaluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Yhteyden hallintaohjelmia tulisi käyttää"
+msgid "Show avatars"
+msgstr "Näytä avatar-kuvat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Tuttavaluettelon lajitteluperuste"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Näytetäänkö tuttavien avatar-kuvakkeet tuttavaluettelossa ja keskusteluikkunoissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
+msgid "Show protocols"
+msgstr "Näytä protokollat"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Älä näytä ponnahdusikkunoita poissaollessa"
+msgid "Show Balance in contact list"
+msgstr "Näytä saldo yhteystietoluettelossa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Älä soita ääniä poissaollessa"
+msgid "Whether to show account balances in the contact list."
+msgstr "Haluatko näyttää tilien saldot yhteystietoluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Näytä ajankohtaiset tapahtumat tilarivillä"
+msgid "Compact contact list"
+msgstr "Pienikokoinen tuttavaluettelo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Näytä ajankohtaiset tapahtumat tilarivillä. Mikäli epätosi, näytä ne "
-"käyttäjälle välittömästi."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Näytetäänkö tuttavaluettelo pienoiskokoa käytettäessä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Kaiun poiston tuki"
+msgid "Hide main window"
+msgstr "Piilota pääikkuna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy voi julkaista käyttäjän sijainnin"
+msgid "Hide the main window."
+msgstr "Piilota pääikkuna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy voi käyttää GPS:ää paikantamaan sijainnin"
+msgid "Default directory to select an avatar image from"
+msgstr "Oletushakemisto, josta avatar-kuvat haetaan"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy voi käyttää matkapuhelinverkkoa paikantamaan sijainnin"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy voi käyttää verkkoa paikantamaan sijainnin"
+msgid "Open new chats in separate windows"
+msgstr "Avaa uusi ikkuna uusille keskusteluille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathyn noutojen oletuskansio"
+msgid "Always open a separate chat window for new chats."
+msgstr "Avaa aina uusi ikkuna uusille keskusteluille."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy on siirtänyt butterfly:n lokit"
+msgid "Display incoming events in the status area"
+msgstr "Näytä ajankohtaiset tapahtumat tilarivillä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr ""
-"Empathyn tulisi merkitä automaattisesti poissaolevaksi, mikäli konetta ei "
-"käytetä"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Näytä ajankohtaiset tapahtumat tilarivillä. Mikäli epätosi, näytä ne käyttäjälle välittömästi."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy yrittää yhdistää automaattisesti käynnistettäessä"
+msgid "The position for the chat window side pane"
+msgstr "Keskusteluikkunan sivupaneelin sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinä)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
+msgid "Show contact groups"
+msgstr "Näytä yhteyshenkilöryhmät"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Käytä WebKit-kehittäjän työkaluja"
+#, fuzzy
+msgid "Whether to show groups in the contact list."
+msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Näytä ponnahdusikkuna uusille viesteille"
+msgid "Contact list sort criterion"
+msgstr "Tuttavaluettelon lajitteluperuste"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Käytä oikeinkirjoituksen tarkistusta"
+#, fuzzy
+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 "Kuinka tuttavaluettelo järjestetään. Oletusarvolla \"name\" järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo järjestetään tuttavien tilan perusteella."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Piilota pääikkuna"
+msgid "Use notification sounds"
+msgstr "Käytä merkkiääniä"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Piilota pääikkuna."
+msgid "Whether to play a sound to notify of events."
+msgstr "Ilmoitetaanko tapahtumista merkkiäänin."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Lempinimen täydennysmerkki"
+msgid "Disable sounds when away"
+msgstr "Älä soita ääniä poissaollessa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Avaa uusi ikkuna uusille keskusteluille"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Käytettävän Adium-teeman sijainti"
+msgid "Play a sound for incoming messages"
+msgstr "Soita merkkiääni saapuville viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ilmoitetaanko saapuvista viesteistä merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "Soita merkkiääni saapuville viesteille"
+msgid "Play a sound for outgoing messages"
+msgstr "Soita merkkiääni lähetettäville viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Soita merkkiääni uusista keskusteluista"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ilmoitetaanko lähtevistä viesteistä merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "Soita merkkiääni lähetettäville viesteille"
+msgid "Play a sound for new conversations"
+msgstr "Soita merkkiääni uusista keskusteluista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Soita merkkiääni tuttavan kirjautuessa sisään"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ilmoitetaanko uusista keskusteluista merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Soita merkkiääni tuttavan kirjautuessa ulos"
+msgid "Play a sound when a contact logs in"
+msgstr "Soita merkkiääni tuttavan kirjautuessa sisään"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Soita merkkiääni kirjauduttaessa sisään"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ilmoitetaanko tuttavien sisäänkirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Soita merkkiääni kirjauduttaessa ulos"
+msgid "Play a sound when a contact logs out"
+msgstr "Soita merkkiääni tuttavan kirjautuessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisään"
+msgid "Play a sound when we log in"
+msgstr "Soita merkkiääni kirjauduttaessa sisään"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Play a sound when we log out"
+msgstr "Soita merkkiääni kirjauduttaessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr ""
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiäänellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Näytä avatar-kuvat"
+msgid "Enable popup notifications for new messages"
+msgstr "Näytä ponnahdusikkuna uusille viesteille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Näytä tuttavaluettelo huoneissa"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Näytetäänkö uudesta viestistä ponnahdusilmoitus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Näytä vihje pääikkunan sulkemisesta"
+msgid "Disable popup notifications when away"
+msgstr "Älä näytä ponnahdusikkunoita poissaollessa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Näytä linjoilta poissa olevat tuttavat"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Näytetäänkö ponnahdusilmoituksia varattuna tai poissa oltaessa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Näytä protokollat"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ponnahdusilmoitus kohdistamattomasta keskustelusta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Kielentarkastuksessa käytetyt kielet"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Näytetäänkö avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta viestistä ponnahdusilmoitus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Oletuskansio, johon siirretyt tiedostot tallennetaan."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ponnahdusilmoitus tuttavan kirjautuessa sisään"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Viimeisin hakemisto, josta avatar-kuva oli valittu."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Näytetäänkö ponnahdusilmoitus tuttavan sisäänkirjautumisesta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Keskusteluikkunan sivupaneelin sijainti"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ponnahdusilmoitus tuttavan kirjautuessa ulos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Keskusteluikkunan sivupaneelin tallennettu sijainti (pikseleinä)."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Näytetäänkö ponnahdusilmoitus tuttavan uloskirjautumisesta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Keskusteluikkunoissa käytettävä teema."
+msgid "Use graphical smileys"
+msgstr "Käytä hymiökuvakkeita"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"Teemamuunnos jota käytetään näyttämään keskustelu keskusteluikkunoissa."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Näytetäänkö keskusteluiden hymiöt hymiökuvakkeina."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "Käytä hymiökuvakkeita"
+msgid "Show contact list in rooms"
+msgstr "Näytä tuttavaluettelo huoneissa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Käytä merkkiääniä"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Näytetäänkö tuttavaluettelo keskusteluhuoneissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Käytä teemaa keskusteluhuoneille"
+msgid "Chat window theme"
+msgstr "Keskusteluikkunan teema"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Saako Empathy paljastaa käyttäjän sijainnin tuttaville."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Keskusteluikkunoissa käytettävä teema."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Saako Empathy käyttää GPS:ää sijainnin arvaamiseen."
+msgid "Chat window theme variant"
+msgstr "Keskusteluikkunan teemamuunnos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Saako Empathy käyttää matkapuhelinverkkoa sijainnin arvaamiseen."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Teemamuunnos jota käytetään näyttämään keskustelu keskusteluikkunoissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Saako Empathy käyttää verkkoa sijainnin arvaamiseen."
+msgid "Path of the Adium theme to use"
+msgstr "Käytettävän Adium-teeman sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Onko Empathy siirtänyt butterfly-lokit."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Adium-teeman sijainti Adiumia keskustelun teemana käytettäessä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Kirjautuuko Empathy tileillesi automaattisesti käynnistymisensä yhteydessä."
+msgid "Enable WebKit Developer Tools"
+msgstr "Käytä WebKit-kehittäjän työkaluja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Tulisiko Empathyn merkitä käyttäjä automaattisesti poissaolevaksi, mikäli "
-"konetta ei käytetä."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Otetaanko WebKit-kehittäjän työkalut, kuten Web-tutkain, käyttöön."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
+msgid "Inform other users when you are typing to them"
+msgstr "Salli muiden käyttäjien nähdä, että kirjoitat viestiä heille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
 msgstr ""
-"Käyttääkö Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Otetaanko WebKit-kehittäjän työkalut, kuten Web-tutkain, käyttöön."
+msgid "Use theme for chat rooms"
+msgstr "Käytä teemaa keskusteluhuoneille"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Käyttääkö Empathy yhteyksienhallintaa verkkoyhteyksien automaattiseen "
-"luomiseen ja katkaisuun."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Käytetäänkö teemaa keskusteluhuoneissa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellä."
+msgid "Spell checking languages"
+msgstr "Kielentarkastuksessa käytetyt kielet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Näytetäänkö keskusteluiden hymiöt hymiökuvakkeina."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Pilkuilla eroteltu lista oikeinkirjoituksen tarkistusohjelman käyttämistä kielistä (esim. \"fi, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Enable spell checker"
+msgstr "Käytä oikeinkirjoituksen tarkistusta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ilmoitetaanko tuttavien sisäänkirjautumisesta merkkiäänellä."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Tarkistetaanko kirjoitetut sanat oikolukukielellä."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ilmoitetaanko tuttavien uloskirjautumisesta merkkiäänellä."
+msgid "Nick completed character"
+msgstr "Lempinimen täydennysmerkki"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Ilmoitetaanko tapahtumista merkkiäänin."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Lempinimen jälkeen lisättävä merkki, kun käytetään lempinimen täydennystä (sarkain) ryhmäkeskustelussa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ilmoitetaanko saapuvista viesteistä merkkiäänellä."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy yrittää käyttää tuttavan avatarta keskusteluikkunan kuvakkeena"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ilmoitetaanko uusista keskusteluista merkkiäänellä."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Käyttääkö Empathy tuttavan avatar-kuvaketta keskusteluikkunan kuvakkeena."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ilmoitetaanko lähtevistä viesteistä merkkiäänellä."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ilmoitetaanko verkkoon kirjautumisesta merkkiäänellä."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ilmoitetaanko verkosta uloskirjautumisesta merkkiäänellä."
+msgid "Camera device"
+msgstr "Kamera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ilmoitetaanko tapahtumista merkkiäänin varattuna tai poissa oltaessa."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Oletuskamera videopuheluihin, esim. /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Näytetäänkö ponnahdusilmoitus tuttavan uloskirjautumisesta."
+msgid "Camera position"
+msgstr "Kameran sijainti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Näytetäänkö ponnahdusilmoitus tuttavan sisäänkirjautumisesta."
+msgid "Position the camera preview should be during a call."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Näytetäänkö avatussa, kohdistamattomassa keskustelussa saapuneesta uudesta "
-"viestistä ponnahdusilmoitus."
+msgid "Echo cancellation support"
+msgstr "Kaiun poiston tuki"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Näytetäänkö uudesta viestistä ponnahdusilmoitus."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Käytetäänkö Pulseaudion suodatinta kaiun poistamiseksi."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr ""
+msgid "Show hint about closing the main window"
+msgstr "Näytä vihje pääikkunan sulkemisesta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Näytetäänkö tuttavien avatar-kuvakkeet tuttavaluettelossa ja "
-"keskusteluikkunoissa."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Pyydetäänkö pääikkunan sulkemisesta vahvistusta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Näytetäänkö poissa linjoilta olevat tuttavat tuttavaluettelossa."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy voi julkaista käyttäjän sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Näytetäänkö ponnahdusilmoituksia varattuna tai poissa oltaessa."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Saako Empathy paljastaa käyttäjän sijainnin tuttaville."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Näytetäänkö tuttavien yhteyskäytännöt tuttavaluettelossa."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy voi käyttää verkkoa paikantamaan sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Näytetäänkö tuttavaluettelo keskusteluhuoneissa."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Saako Empathy käyttää verkkoa sijainnin arvaamiseen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Näytetäänkö tuttavaluettelo pienoiskokoa käytettäessä."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy voi käyttää matkapuhelinverkkoa paikantamaan sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "Pyydetäänkö pääikkunan sulkemisesta vahvistusta."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Saako Empathy käyttää matkapuhelinverkkoa sijainnin arvaamiseen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Käytetäänkö teemaa keskusteluhuoneissa."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy voi käyttää GPS:ää paikantamaan sijainnin"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-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."
-msgstr ""
-"Kuinka tuttavaluettelo järjestetään. Oletusarvolla \"name\" "
-"järjestelyperusteena on tuttavan nimi. Arvolla \"state\" luettelo "
-"järjestetään tuttavien tilan perusteella."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Saako Empathy käyttää GPS:ää sijainnin arvaamiseen."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Hallitse viestimiä ja Internet-puheluiden (VoIP) käyttäjätilejä"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathyn pitää heikentää sijainnin tarkkuutta"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Viestintä ja VoIP-käyttäjätilit"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Alentaako Empathy sijaintitiedon tarkkuutta yksityisyyden suojaamiseksi."
+
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Syytä ei annettu"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Pyydettiin tilan muutosta"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Keskeytit tiedostonsiirron"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Virhe yritettäessä siirtää tiedostoa"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Tuntematon syy"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Tiedostonsiirto valmistui, mutta tiedosto oli viallinen"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Etäyhteys ei tue tiedostonsiirtoa"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Valittu tiedosto ei ole tavanomainen tiedosto"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Valittu tiedosto on tyhjä"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Vastaamaton puhelu käyttäjältä %s"
@@ -536,452 +534,394 @@ msgstr "Soitettiin käytäjälle %s"
 msgid "Call from %s"
 msgstr "Puhelu käyttäjältä %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Pistoketyyppi ei ole tuettu"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Syytä ei annettu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Pyydettiin tilan muutosta"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Keskeytit tiedostonsiirron"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Toinen osapuoli katkaisi tiedostonsiirron"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Virhe yritettäessä siirtää tiedostoa"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Toinen osapuoli ei voi siirtää tiedostoa"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Tuntematon syy"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tavoitettavissa"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Näkymätön"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Erittelemätön syy"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Tila on nyt ”Poissa linjoilta”"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Verkkovirhe"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Salausvirhe"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nimi on käytössä"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Varmennetta ei ole annettu"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Varmenne ei ole luotettu"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Varmenne on vanhentunut"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Varmenne ei ole vielä aktivoitu"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Varmenteen verkkonimi ei täsmää"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Varmenteen sormenjälki ei täsmää"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Itseallekirjoitettu varmenne"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Varmennevirhe"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Salausta ei ole käytettävissä"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Varmenne ei ole kelvollinen"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Yhteys hylättiin"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Yhteyttä ei voi muodostaa"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Yhteys katkesi"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Tämä resurssi on jo yhdistetty palvelimelle"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Tämä tili on jo yhteydessä palvelimeen"
 
-#: ../libempathy/empathy-utils.c:346
-msgid ""
-"Connection has been replaced by a new connection using the same resource"
+#: ../libempathy/empathy-utils.c:357
+msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Yhteys on korvattu samaa resurssia käyttävällä uudella yhteydellä"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Tili on jo olemassa palvelimella"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Palvelin on liian kiireinen käsitelläkseen tätä yhteyttä"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Varmenne on kumottu"
 
-#: ../libempathy/empathy-utils.c:355
-msgid ""
-"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Varmenne käyttää heikkoa salausmenetelmää"
 
-#: ../libempathy/empathy-utils.c:358
-msgid ""
-"The length of the server certificate, or the depth of the server certificate "
-"chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat "
-"suurempia kuin salauskirjasto sallii"
+#: ../libempathy/empathy-utils.c:369
+msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
+msgstr "Palvelinsertifikaatin pituus tai palvelinsertifikaattiketjun pituus ovat suurempia kuin salauskirjasto sallii"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Sovelluksesi on liian vanha"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Sisäinen virhe"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Lähellä olevat ihmiset"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-keskustelu"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekunti sitten"
 msgstr[1] "%d sekuntia sitten"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuutti sitten"
 msgstr[1] "%d minuuttia sitten"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d tunti sitten"
 msgstr[1] "%d tuntia sitten"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d päivä sitten"
 msgstr[1] "%d päivää sitten"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d viikko sitten"
 msgstr[1] "%d viikkoa sitten"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d kuukausi sitten"
 msgstr[1] "%d kuukautta sitten"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "tulevaisuudessa"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Kaikki tilit"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Käyttäjätili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Palvelin"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Portti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Omat WWW-tilit"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Käyttäjätiliä %s ei voi muokata Empathyssä."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Käynnistä Web-tilit"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Muokkaa %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Käyttäjänimi:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Toteuta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Kirjaudu sisään"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Tämä tili on jo olemassa palvelimella"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Luo uusi tili palvelimelle"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Peru"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%s palvelimella %s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-tili"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Uusi tili"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Esimerkki:</b> Nimimerkkini"
+#: ../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:"
+msgstr "S_alasana:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Lisäasetukset"
+msgid "Screen _Name:"
+msgstr "Näyttö_nimi:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Esimerkki:</b> Nimimerkkini"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "S_alasana:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Muista salasana"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Portti:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Muista salasana"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Näyttö_nimi:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "Pal_velin:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Mikä on AIM-salasanasi?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Lisäasetukset"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Mikä on AIM-näyttönimesi?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Portti:"
+msgid "What is your AIM password?"
+msgstr "Mikä on AIM-salasanasi?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "Pal_velin:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Esimerkki:</b> käyttäjänimi"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Muista salasana"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_Käyttäjätunnus:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Esimerkki:</b> käyttäjänimi"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Mikä on GroupWise-käyttäjätunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Mikä on GroupWise-salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Esimerkki:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Merkkikartta:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Mikä on ICQ UIN -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Mikä on ICQ-salasanasi?"
 
@@ -1018,25 +958,25 @@ msgstr "Valinnat"
 msgid "None"
 msgstr "Ei mitään"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Verkko"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Merkkikartta:"
+msgid "Network:"
+msgstr "Verkko:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
-"Useimmat IRC-palvelimet eivät tarvitse salasanaa, joten jos et ole varma, "
-"älä syötä salasanaa."
+msgid "Character set:"
+msgstr "Merkkikartta:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Verkko"
+msgid "Servers"
+msgstr "Palvelimet"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Verkko:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Useimmat IRC-palvelimet eivät tarvitse salasanaa, joten jos et ole varma, älä syötä salasanaa."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1054,265 +994,250 @@ msgstr "Lopetusviesti:"
 msgid "Real name:"
 msgstr "Oikea nimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Palvelimet"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Mikä on IRC-nimimerkkisi?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Mikä IRC-verkko?"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Mikä on IRC-nimimerkkisi?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Mikä on Facebook-käyttäjänimesi?"
+
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "This is your username, not your normal Facebook login.\nIf you are facebook.com/<b>badger</b>, enter <b>badger</b>.\nUse <a href=\"http://www.facebook.com/username/\">this page</a> to choose a Facebook username if you don't have one."
+msgstr "Kyseessä on käyttäjänimi, ei normaalisti Facebook-kirjautumiseen käytettävä sähköpostiosoite.\nJos käyttäjänimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita <b>tunnus</b>.\nJos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a href=\"http://www.facebook.com/username/\">tällä sivulla</a>."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "Mikä on Facebook-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "Mikä on Google-tunnuksesi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user@gmail.com"
 msgstr "<b>Esimerkki:</b> nimi@gmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "Mikä on Google-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "<b>Example:</b> user@jabber.org"
 msgstr "<b>Esimerkki:</b> nimi@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Salaus vaa_ditaan (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
 msgstr "_Älä huomioi SSL-varmenteiden virheitä"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Ohita palvelimen asetukset"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
 msgstr "_Prioriteetti:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
 msgstr "Res_urssi:"
 
-#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid ""
-"This is your username, not your normal Facebook login.\n"
-"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
-msgstr ""
-"Kyseessä on käyttäjänimi, ei normaalisti Facebook-kirjautumiseen käytettävä "
-"sähköpostiosoite.\n"
-"Jos käyttäjänimesi on esimerkiksi facebook.com/<b>tunnus</b>, kirjoita "
-"<b>tunnus</b>.\n"
-"Jos et ole vielä luonut Facebook-käyttäjänimeä, voit luoda sellaisen <a href="
-"\"http://www.facebook.com/username/\">tällä sivulla</a>."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Käytä vanhaa SS_L-porttia"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "What is your Facebook password?"
-msgstr "Mikä on Facebook-salasanasi?"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Salaus vaa_ditaan (TLS/SSL)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Mikä on Facebook-käyttäjänimesi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-msgid "What is your Google ID?"
-msgstr "Mikä on Google-tunnuksesi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "What is your Google password?"
-msgstr "Mikä on Google-salasanasi?"
+msgid "Use old SS_L"
+msgstr "Käytä vanhaa SS_L-porttia"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Ohita palvelimen asetukset"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Mikä on Jabber-tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Mikä on Jabber-salasanasi?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Mikä on haluamasi Jabber-tunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Mikä on Jabber-salasanasi?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Mikä on haluamasi Jabber-salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Esimerkki:</b> tunnus@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Mikä on Windows Live -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Mikä on Windows Live -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Sähköposti_osoite:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Ni_mimerkki:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Sukunimi:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Etunimi:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Julkaistu nimi:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-tunniste:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Sukunimi:"
+msgid "E-_mail address:"
+msgstr "Sähköposti_osoite:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Julkaistu nimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Käyttäjänimi:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Esimerkki:</b> käyttäjä@sip-palvelimen.osoite"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Tunnistautumisen käyttäjänimi:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Löydä Sidonta"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Havaitse STUN-palvelin automaattisesti"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Sivuuta TLS-virheet"
+msgid "NAT Traversal Options"
+msgstr "NAT-läpäisyn (NAT-T) asetukset"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Aikaväli (sekunneissa)"
+msgid "Proxy Options"
+msgstr "Välipalvelinvalinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Käynnissä pitävät valinnat"
+msgid "Miscellaneous Options"
+msgstr "Muut valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Löyhä reititys"
+msgid "STUN Server:"
+msgstr "STUN-palvelin:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanismi:"
+msgid "Discover the STUN server automatically"
+msgstr "Havaitse STUN-palvelin automaattisesti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Muut valinnat"
+msgid "Discover Binding"
+msgstr "Löydä Sidonta"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT-läpäisyn (NAT-T) asetukset"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Käynnissä pitävät valinnat"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Portti:"
+msgid "Mechanism:"
+msgstr "Mekanismi:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Välipalvelinvalinnat"
+msgid "Interval (seconds)"
+msgstr "Aikaväli (sekunneissa)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Tunnistautumisen käyttäjänimi:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Siirto:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-palvelin:"
+msgid "Loose Routing"
+msgstr "Löyhä reititys"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Palvelin:"
+msgid "Ignore TLS Errors"
+msgstr "Sivuuta TLS-virheet"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Siirto:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
+msgid "Port:"
+msgstr "Portti:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Mikä on SIP-tilisi salasana?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Mikä on SIP-tilisi käyttäjätunnus?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Käyttäjänimi:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Mikä on SIP-tilisi salasana?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-_tunnus:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Älä huomioi konferenssi- ja keskusteluhuonekutsuja"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Huoneluettelon maa-asetusto:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Mikä on Yahoo! -tunnuksesi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Mikä on Yahoo! -salasanasi?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-_tunnus:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Huoneluettelon maa-asetusto:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Kuvaa ei voitu muuntaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
-msgstr ""
-"Järjestelmässäsi ei ole tukea yhdellekään hyväksytylle kuvatiedostomuodolle"
+msgstr "Järjestelmässäsi ei ole tukea yhdellekään hyväksytylle kuvatiedostomuodolle"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Valitse avatar-kuvasi"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Ota kuva..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Ei kuvaa"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Kuvat"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Kaikki tiedostot"
 
@@ -1320,242 +1245,245 @@ msgstr "Kaikki tiedostot"
 msgid "Click to enlarge"
 msgstr "Suurenna napsauttamalla"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Puhelun aloittamisessa tapahtui virhe"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Valittu yhteystieto ei tue puheluja"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Valittu yhteystieto on poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Valittu yhteystieto on virheellinen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Tämä protokolla ei tue hätäpuheluita"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Yksityiskeskustelun avaaminen epäonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Aihe ei ole tuettu tässä keskustelussa"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Sinulla ei ole oikeutta muuttaa aihetta"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1030
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pyyhi kaikki nykyisen keskustelun viestit pois näkyvistä"
 
-#: ../libempathy-gtk/empathy-chat.c:1033
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <aihe>: aseta nykyisen keskustelun aihe"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1039
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <kanavan nimi>: liity kanavalle"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
-msgid ""
-"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
-"current one"
+#: ../libempathy-gtk/empathy-chat.c:1099
+msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1047
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <tuttavan tunnus> [<viesti>]: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1050
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <tuttavan tunnus> <viesti>: avaa yksityiskeskustelu"
 
-#: ../libempathy-gtk/empathy-chat.c:1053
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nimi>: vaihda nimeä nykyisellä palvelimella"
 
-#: ../libempathy-gtk/empathy-chat.c:1056
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <viesti>: lähetä TOIMINTO viesti tämänhetkiseen keskusteluun"
 
-#: ../libempathy-gtk/empathy-chat.c:1059
-msgid ""
-"/say <message>: send <message> to the current conversation. This is used to "
-"send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chat room\""
-msgstr ""
-"/say <viesti>: lähettää <viestin> sisällön kokonaisuudessaan keskusteluun. "
-"Tätä toimintoa käytetään kun viestin halutaan alkavan merkillä \"/\", "
-"esimerkiksi: \"/say /join komentoa käytetään kanavalle liittymiseen\""
+#: ../libempathy-gtk/empathy-chat.c:1115
+msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
+msgstr "/say <viesti>: lähettää <viestin> sisällön kokonaisuudessaan keskusteluun. Tätä toimintoa käytetään kun viestin halutaan alkavan merkillä \"/\", esimerkiksi: \"/say /join komentoa käytetään kanavalle liittymiseen\""
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1067
-msgid ""
-"/help [<command>]: show all supported commands. If <command> is defined, "
-"show its usage."
-msgstr ""
-"/help [<komento>]: näyttää kaikki tuetut komennot. Jos <komento> on "
-"määritetty, näytä sen ohje."
+#: ../libempathy-gtk/empathy-chat.c:1123
+msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
+msgstr "/help [<komento>]: näyttää kaikki tuetut komennot. Jos <komento> on määritetty, näytä sen ohje."
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Käyttö: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
-#: ../libempathy-gtk/empathy-chat.c:1242
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Tuntematon komento; kirjoita /help nähdäksesi käytössä olevat komennot"
 
+#: ../libempathy-gtk/empathy-chat.c:1564
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Virhe viestiä lähettäessä: %s"
+
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1412
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1421
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "poissa linjoilta"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "virheellinen tuttava"
 
-#: ../libempathy-gtk/empathy-chat.c:1427
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "lupa evätty"
 
-#: ../libempathy-gtk/empathy-chat.c:1430
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "liian pitkä viesti"
 
-#: ../libempathy-gtk/empathy-chat.c:1433
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ei toteutettu"
 
-#: ../libempathy-gtk/empathy-chat.c:1437
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../libempathy-gtk/empathy-chat.c:1443
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Virhe lähetettäessä viestiä \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1447
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Virhe viestiä lähettäessä: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1508 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libempathy-gtk/empathy-chat.c:1520
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Aihe asetettu: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s asetti aiheeksi: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Aihetta ei ole annettu"
 
-#: ../libempathy-gtk/empathy-chat.c:2031
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Ei ehdotuksia)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2099
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Lisää ”%s” sanakirjaan"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Lisää ”%s” kielen %s sanakirjaan"
 
-#: ../libempathy-gtk/empathy-chat.c:2206
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2224
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2278
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Kielentarkistuksen ehdotukset"
 
-#: ../libempathy-gtk/empathy-chat.c:2367
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Viimeisimpien lokien nouto epäonnistui"
 
-#: ../libempathy-gtk/empathy-chat.c:2504
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s katkaisi"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
-#.
-#: ../libempathy-gtk/empathy-chat.c:2511
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s potkaisi henkilön %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2514
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s potkaistiin"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
-#.
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s esti henkilön %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2525
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s estettiin"
 
-#: ../libempathy-gtk/empathy-chat.c:2529
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s on poistunut huoneesta"
@@ -1564,105 +1492,108 @@ msgstr "%s on poistunut huoneesta"
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
-#.
-#: ../libempathy-gtk/empathy-chat.c:2538
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s on saapunut huoneeseen"
 
-#: ../libempathy-gtk/empathy-chat.c:2588
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s vaihtoi nimekseen %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2727
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:2355
+#. 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:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3374
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Haluaisitteko tallentaa tämän salasanan?"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Muista"
 
-#: ../libempathy-gtk/empathy-chat.c:3390
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Ei nyt"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: ../libempathy-gtk/empathy-chat.c:3438
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Väärä salasana, yritä uudelleen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3568
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Huone on salasanasuojattu:"
 
-#: ../libempathy-gtk/empathy-chat.c:3595
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Liity"
 
-#: ../libempathy-gtk/empathy-chat.c:3797 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Keskustelu"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3857
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Tuntematon tai virheellinen tunniste"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Yhteyshenkilöiden esto tilapäisesti poissa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Yhteyshenkilöiden esto poissa"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Pääsy evätty"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Yhteystietoa ei voitu estää"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Muokkaa estettyjä yhteystietoja"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1485
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
@@ -1672,578 +1603,548 @@ msgstr "Estetyt yhteyshenkilöt"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Poista"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopioi linkin osoite"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Avaa linkki"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Muokkaa tuttavan tietoja"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Henkilökohtaiset tiedot"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Uusi tuttava"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Oletko varma käyttäjän '%s' estämisestä?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Raportoi tämä yhteyshenkilö loukkaavana"
 msgstr[1] "_Raportoi nämä yhteyshenkilöt loukkaavina"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Päätä myöhemmin"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Liittymispyyntö"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "Es_tä käyttäjä"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Ryhmittelemättömät"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Suosikkihenkilöt"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Haluatko varmasti poistaa ryhmän \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Poistetaan ryhmää"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Poista"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Poistetaan tuttava"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Lisää tuttava…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Es_tä yhteystieto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Keskustele"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Äänipuhelu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videopuhelu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Aiemmat keskustelut"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Lähetä tiedosto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Jaa työpöytäni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1373
-msgid "Favorite"
-msgstr "Suosikki"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Tietoja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Muokkaa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Kutsuu sinut tähän keskusteluhuoneeseen"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_Kutsu keskusteluhuoneeseen"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Päätä myöhemmin"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Etsi yhteystietoja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Etsi: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Lisää yhteystieto"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Yhteystietoa ei löytynyt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Valitse tuttava"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Koko nimi:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Puhelinnumero:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Sähköpostiosoite:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Kotisivu:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Syntymäpäivä:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Viimeksi nähty:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Yhdisti kohteesta:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poissaoloviesti:"
+msgstr "Salli minun nähdä, milloin olet verkossa. Kiitos!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanavat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Maan ISO-tunnus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Maa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Alue:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Postinumero:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Katu:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Rakennus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Kerros:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Huone:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Tarkkuustaso:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Virhe:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikaalinen virhe (metriä):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horisontaalinen virhe (metriä):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Suuntima:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Kiipeämisvauhti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Viimeksi päivitetty:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Pituuspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Leveyspiiri:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Korkeus:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sijainti"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e. %Bta %Y klo %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Tallenna vastaus"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Avataria ei voitu tallentaa"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Sijainti</b> hetkellä (pvm)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nimimerkki:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Asiakastiedot"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Asiakasohjelma:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Henkilökohtaiset tiedot:"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Tuttavan tiedot"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Koko nimi"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Puhelinnumero"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Sähköpostiosoite"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "WWW-sivusto"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Syntymäpäivä"
+
+#. 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 "Viimeksi nähty:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Yhdisti kohteesta:"
+
+#. 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 "Poissaoloviesti:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "työ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "koti"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "matkapuhelin"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "ääni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "ensisijainen"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postiosoite"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#, fuzzy
+msgid "parcel"
+msgstr "Ulkoasu"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1515
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Tunniste:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Nimimerkki:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)	"
+msgstr "<b>Sijainti</b> hetkellä (pvm)	"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Pyydetään tietoja…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Asiakastiedot"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "Käyttöjärjestelmä:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Asiakasohjelma:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
-msgid ""
-"Select the groups you want this contact to appear in.  Note that you can "
-"select more than one group or no groups."
-msgstr ""
-"Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että voit "
-"valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
+#: ../libempathy-gtk/empathy-groups-widget.c:343
+msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
+msgstr "Valitse ryhmät, joissa haluat tämän tuttavan näkyvän. Huomaa että voit valita useita ryhmiä tai olla valitsematta yhtään ryhmää."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Lisää ryhmä"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Valitse"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Ryhmä"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#, invalid-plural
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#, invalid-plural
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] ""
 msgstr[1] ""
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Linkitetyt yhteystiedot"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Valitse linkitettävät yhteystiedot"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Uuden yhteystiedon esikatselu"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Vasemmanpuoleisesta luettelosta valitut yhteystiedot linkitetään yhteen."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Muokkaa tuttavan tietoja"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Valitse soittoon käytettävä tili"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Soita"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Matkapuhelin"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Työ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Koti"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "Es_tä yhteystieto"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Keskustele"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Äänipuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videopuhelu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Aiemmat keskustelut"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Lähetä tiedosto"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Jaa työpöytäni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Suosikki"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Pakettia gnome-contacts ei ole asennettu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Tietoja"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Linkitä yhteystiedot…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Kutsuu sinut tähän keskusteluhuoneeseen"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Kutsu keskusteluhuoneeseen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Lisää tuttava…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Poista ja _estä"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, 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 ""
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Haluatko varmasti poistaa ryhmän \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Poistetaan ryhmää"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Poista"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Haluatko varmasti poistaa tuttavan \"%s\" yhteystiedot?"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1662
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
+msgid "Do you really want to remove the linked contact '%s'? Note that this will remove all the contacts which make up this linked contact."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Poistetaan tuttava"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format, invalid-plural
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
 msgstr[0] ""
@@ -2253,23 +2154,23 @@ msgstr[1] ""
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Sijainti</b> hetkellä (pvm)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
-msgstr ""
+msgstr "Linjoilla puhelimesta tai mobiililaitteesta"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Uusi verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Valitse IRC-verkko"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Valitse"
@@ -2282,247 +2183,259 @@ msgstr "uusi palvelin"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Linkitä yhteystiedot"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Poista linkitys…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Linkitä"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Poista linkitys"
-
-#: ../libempathy-gtk/empathy-log-window.c:633
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:688
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Näytä"
 
-#: ../libempathy-gtk/empathy-log-window.c:710
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Etsi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1158
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1160
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Keskustele käyttäjän %s kanssa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1210
-#: ../libempathy-gtk/empathy-log-window.c:1357
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr ""
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1299
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1305
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1376
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s sekunti"
+msgstr[1] "%s sekuntia"
+
 #: ../libempathy-gtk/empathy-log-window.c:1378
-#: ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minuutti"
+msgstr[1] "%s minuuttia"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Puhelun kesto %s, puhelu päättyi %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1717
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Tänään"
 
-#: ../libempathy-gtk/empathy-log-window.c:1721
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: ../libempathy-gtk/empathy-log-window.c:1737
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+#, fuzzy
 msgid "%e %B %Y"
-msgstr ""
+msgstr "%A %d. %Bta %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1818
-#: ../libempathy-gtk/empathy-log-window.c:3399
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
-msgstr ""
+msgstr "Milloin tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:1898
-#: ../libempathy-gtk/empathy-log-window.c:2328
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
-msgstr ""
+msgstr "Kuka tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2640
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kuka"
 
-#: ../libempathy-gtk/empathy-log-window.c:2844
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Milloin"
 
-#: ../libempathy-gtk/empathy-log-window.c:2960
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
-msgstr ""
+msgstr "Mitä tahansa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2962
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
-msgstr ""
+msgstr "Tekstikeskustelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2964
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2969
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Saapuneet puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2970
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Soitetut puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2971
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Vastaamattomat puhelut"
 
-#: ../libempathy-gtk/empathy-log-window.c:2993
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Mitä"
 
-#: ../libempathy-gtk/empathy-log-window.c:3702
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
-"Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
+msgstr "Haluatko varmasti poistaa kaikki aikaisempien keskusteluiden historiatiedot?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3706
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Tyhjennä kaikki"
 
-#: ../libempathy-gtk/empathy-log-window.c:3713
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
-msgstr ""
+msgstr "Poista kohteesta:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Ladataan...</span>"
+msgid "_File"
+msgstr "_Tiedosto"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Keskustelu"
+#: ../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 "_Muokkaa"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Poista kaikki historia..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profiili"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Keskustelu"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Muokkaa"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Tiedosto"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "sivu 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Tuttavan tunniste:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ladataan...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Yhteystieto ei ole linjoilla"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Keskustele"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Valittu yhteystieto on joko virheellinen tai tuntematon"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#, fuzzy
+msgid "The contact does not support this kind of conversation"
+msgstr "Aihe ei ole tuettu tässä keskustelussa"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Sinulla on porttikielto tälle kanavalle"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanava on täynnä"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Kanavalle voi liittyä vain kutsusta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#, fuzzy
+msgid "Can't proceed while disconnected"
+msgstr "Yhteys tuttavaan katkaistu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#, fuzzy
+msgid "Permission denied"
+msgstr "lupa evätty"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#, fuzzy
+msgid "There was an error starting the conversation"
+msgstr "Puhelun aloittamisessa tapahtui virhe"
+
+#: ../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 ""
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Uusi keskustelu"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Lähetä _videota"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Videopuhelu"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Soita"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Äänipuhelu"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Uusi puhelu"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format, fuzzy
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Todennus epäonnistui"
+
+#: ../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 ""
-"Anna salasana tilille\n"
-"<b>%s</b>"
+msgid "Enter your password for account\n<b>%s</b>"
+msgstr "Anna salasana tilille\n<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2552,20 +2465,15 @@ msgstr "Napsauta tehdäksesi tästä tilasta suosikin"
 msgid "Set status"
 msgstr "Aseta tila"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Aseta läsnäolosi ja nykyinen tilasi"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Omat viestit…"
 
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
-#.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Uusi %s-tili"
@@ -2575,20 +2483,20 @@ msgid "Find:"
 msgstr "Etsi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr ""
+msgid "_Previous"
+msgstr "_Edellinen"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Lausetta ei löydy"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Seuraava"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Huomioi kirjainkoko"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr ""
+msgid "Phrase not found"
+msgstr "Lausetta ei löydy"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2634,14 +2542,14 @@ msgstr "Puhelu päättyi"
 msgid "Edit Custom Messages"
 msgstr "Muokkaa itse määriteltyjä viestejä"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1030
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
-msgstr ""
+msgstr "Viestiä muokattu %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1720
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
-msgstr ""
+msgstr "Tavallinen"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
@@ -2677,7 +2585,7 @@ msgstr "Varmennetta ei ole vielä aktivoitu."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The certificate does not have the expected fingerprint."
-msgstr ""
+msgstr "Varmenteella ei ole odotettua sormenjälkeä."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
@@ -2688,13 +2596,12 @@ msgid "The certificate is self-signed."
 msgstr "Varmenne on allekirjoitettu itse."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid ""
-"The certificate has been revoked by the issuing Certification Authority."
+msgid "The certificate has been revoked by the issuing Certification Authority."
 msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate is cryptographically weak."
-msgstr ""
+msgstr "Varmenne on kryptografisesti heikko."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
 msgid "The certificate length exceeds verifiable limits."
@@ -2702,7 +2609,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
 msgid "The certificate is malformed."
-msgstr ""
+msgstr "Varmenne on muodostettu väärin."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2715,43 +2622,43 @@ msgid "Certificate hostname: %s"
 msgstr "Varmenteen ilmoittama isäntänimi: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Jatka"
+msgid "C_ontinue"
+msgstr "J_atka"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Yhteys ei ole luotettava. Haluatko kuitenkin jatkaa?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Muista tämä valinta tulevia yhteyksiä varten"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Varmenteen tiedot"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI:a ei voi avata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Tiedoston tallennukseen ei ole riittävästi tilaa"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
-msgid ""
-"%s of free space are required to save this file, but only %s is available. "
-"Please choose another location."
-msgstr ""
-"Tiedoston tallennukseen vaaditaan tilaa vähintään %s, mutta vain %s on "
-"saatavilla. Valitse toinen tallennussijainti."
+msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
+msgstr "Tiedoston tallennukseen vaaditaan tilaa vähintään %s, mutta vain %s on saatavilla. Valitse toinen tallennussijainti."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Saapuva tiedosto käyttäjältä %s"
@@ -2923,830 +2830,602 @@ msgstr "länsimaalainen"
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Valittu tuttava ei voi vastaanottaa tiedostoja."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Valittu tuttava on poissa linjoilta."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Ei virheilmoitusta"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Pikaviesti (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Älä yhdistä käynnistettäessä"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Älä näytä tuttavalistaa tai muita dialogeja käynnistyksessä"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy-pikaviestin"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Virhe yhdistettäessä tilienhallintaan"
 
-#: ../src/empathy.c:639
+#: ../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 ""
-"Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n"
-"\n"
-"%s"
+msgid "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n\n%s"
+msgstr "Yhdistettäessä Empathyn tilienhallintaan tapahtui virhe:\n\n%s"
 
 #: ../src/empathy-about-dialog.c:81
-msgid ""
-"Empathy is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version."
-msgstr ""
-"Empathy on vapaa ohjelma; sitä on sallittu levittää edelleen ja muuttaa GNU "
-"yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free "
-"Software Foundation on ne julkaissut; joko lisenssin version 2, tai "
-"(valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
+msgid "Empathy is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."
+msgstr "Empathy on vapaa ohjelma; sitä on sallittu levittää edelleen ja muuttaa GNU yleisen lisenssin (GPL lisenssin) ehtojen mukaan  sellaisina kuin Free Software Foundation on ne julkaissut; joko lisenssin version 2, tai (valinnan mukaan) minkä tahansa myöhemmän version mukaisesti."
 
 #: ../src/empathy-about-dialog.c:85
-msgid ""
-"Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details."
-msgstr ""
-"Empathyä levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman "
-"mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä "
-"laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä "
-"lisää yksityiskohtia."
+msgid "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+msgstr "Empathyä levitetään siinä toivossa, että se olisi hyödyllinen, mutta ilman mitään takuuta; ilman edes hiljaista takuuta kaupallisesti hyväksyttävästä laadusta tai soveltuvuudesta tiettyyn tarkoitukseen. Katso GPL lisenssistä lisää yksityiskohtia."
 
 #: ../src/empathy-about-dialog.c:89
-msgid ""
-"You should have received a copy of the GNU General Public License along with "
-"Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
-"Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"Empathyn mukana pitäisi tulla kopio GPL-lisenssistä; jos näin ei ole, "
-"kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
+msgid "You should have received a copy of the GNU General Public License along with Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "Empathyn mukana pitäisi tulla kopio GPL-lisenssistä; jos näin ei ole, kirjoita osoitteeseen Free Software Foundation Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomen pikaviestiohjelma"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr ""
-"Samuli Seppänen ja Henna Nykänen, 2006.\n"
-"Ilkka Tuohela, 2006-2009.\n"
-"Tommi Vainikainen, 2009.\n"
-"Ville-Pekka Vainio, 2010.\n"
-"\n"
-"http://www.gnome.fi/\n"
-"\n"
-"Launchpad Contributions:\n"
-"  Antti Kajander https://launchpad.net/~antti-kajander\n"
-"  Christian Hellberg https://launchpad.net/~christian-hellberg\n"
-"  Elias Julkunen https://launchpad.net/~eliasj\n"
-"  Heikki Kulhia https://launchpad.net/~hessuk\n"
-"  Heikki Mäntysaari https://launchpad.net/~heikki-mantysaari\n"
-"  Ilari Oras https://launchpad.net/~ilarioras\n"
-"  Ilkka Tuohela https://launchpad.net/~hile\n"
-"  Ilkka Tuohela https://launchpad.net/~hile-utu\n"
-"  Jammi Vesterinen https://launchpad.net/~jmov\n"
-"  Jani Uusitalo https://launchpad.net/~uusijani\n"
-"  Jere Sokka https://launchpad.net/~jerry-sokka\n"
-"  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n"
-"  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n"
-"  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n"
-"  Kristian Kurki https://launchpad.net/~kristian-kurki\n"
-"  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n"
-"  Mika Suomalainen https://launchpad.net/~mkaysi\n"
-"  Mikko Nissinen https://launchpad.net/~mikko\n"
-"  Miko-Matias Grönvall https://launchpad.net/~matias-gronvall\n"
-"  Ncl8 https://launchpad.net/~crofle\n"
-"  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n"
-"  Tomi Juntunen https://launchpad.net/~tojuntu\n"
-"  Tommi Saira https://launchpad.net/~tommisaira\n"
-"  Tommi Vainikainen https://launchpad.net/~thv\n"
-"  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n"
-"  papukaija https://launchpad.net/~papukaija"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Tilien tuonnin aikana tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Virhe jäsennettäessä käyttäjätilien asetuksia."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Tiliä luodessa tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Tapahtui virhe."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Virheilmoitus: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Voit joko mennä takaisin ja syöttää tilien tiedot uudestaan, tai lopettaa "
-"tämän apulaisen ja lisätä tilit myöhemmin Muokkaa-valikosta."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Tapahtui virhe"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Minkä tyyppinen pikaviestintili sinulla on?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Onko sinulla muita tilejä, jotka haluaisit määritellä?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Syötä tilisi tiedot"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Minkä tyyppisen pikaviestintilin haluat luoda?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Haluatko luoda muita pikaviestintilejä?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Syötä uuden käyttäjätilin tiedot"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Keskustele Empathyn avulla verkossa olevien tuttujen kanssa, joilla on "
-"esimerkiksi Google Talk, AIM, Windows Live tai muu pikaviestintili käytössä. "
-"Mikrofonin ja web-kameran avulla voit myös soittaa ääni- tai videopuheluita."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Onko sinulla käyttäjätili, jota olet käyttänyt toisessa pikaviestimessä?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Kyllä, tuo tilitiedot ohjelmasta "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Kyllä, syötän tilitietoni nyt"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ei, haluan uuden käyttäjätilin"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ei, haluan vain nähdä samassa lähiverkossa linjoilla olevat henkilöt"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Valitse tilit, jotka haluat tuoda:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Kyllä"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ei, tässä oli kaikki"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy voi automaattisesti löytää ja keskustella kanssasi samaan verkkoon "
-"yhdistettyjen ihmisten kanssa. Jos haluat käyttää tätä toimintoa, tarkista "
-"että alla olevat yksityiskohdat pitävät paikkansa. Voit helposti muuttaa "
-"näitä yksityiskohtia myöhemmin tai estää tämän toiminnon käyttämällä ”Tilit”-"
-"valintaikkunaa."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Muokkaa->Tilit"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "En _halua käyttää tätä ominaisuutta juuri nyt"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Et voi keskustella paikalliseen verkkoon liittyneiden ihmisten kanssa sillä "
-"telepathy-salut ei ole asennettu. Jos haluat ottaa tämän ominaisuuden "
-"käyttöön, asenna telepathy-salut paketti ja luo läheiset ihmiset -tili Tilit-"
-"ikkunassa."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "pakettia telepathy-salut ei ole asennettu"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Viestintä- ja VoIP-käyttäjätilien apulainen"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Tervetuloa Empathyyn"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Tuo olemassa olevat käyttäjätilit"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Syötä henkilökohtaiset tiedot"
+msgstr "Samuli Seppänen ja Henna Nykänen, 2006.\nIlkka Tuohela, 2006-2009.\nTommi Vainikainen, 2009.\nVille-Pekka Vainio, 2010.\n\nhttp://www.gnome.fi/\n\nLaunchpad Contributions:\n  Antti Kajander https://launchpad.net/~antti-kajander\n  Christian Hellberg https://launchpad.net/~christian-hellberg\n  Elias Julkunen https://launchpad.net/~eliasj\n  Heikki Kulhia https://launchpad.net/~hessuk\n  Heikki Mäntysaari https://launchpad.net/~heikki-mantysaari\n  Ilari Oras https://launchpad.net/~ilarioras\n  Ilkka Tuohela https://launchpad.net/~hile\n  Ilkka Tuohela https://launchpad.net/~hile-utu\n  Jammi Vesterinen https://launchpad.net/~jmov\n  Jani Uusitalo https://launchpad.net/~uusijani\n  Jere Sokka https://launchpad.net/~jerry-sokka\n  Jiri Grönroos https://launchpad.net/~jiri-gronroos\n  Joonas Pajuniva https://launchpad.net/~joonas-pajuniva\n  Jussi Aalto https://launchpad.net/~jtaalto-deactivatedaccount\n  Kristian Kurki https://launchpad.net/~kristian-kurki\n  Matti Karnaattu https://launchpad.net/~mattikarnaattu\n  Mika Suomalainen https://launchpad.net/~mkaysi\n  Mikko Nissinen https://launchpad.net/~mikko\n  Miko-Matias Grönvall https://launchpad.net/~matias-gronvall\n  Ncl8 https://launchpad.net/~crofle\n  Timo Jyrinki https://launchpad.net/~timo-jyrinki\n  Tomi Juntunen https://launchpad.net/~tojuntu\n  Tommi Saira https://launchpad.net/~tommisaira\n  Tommi Vainikainen https://launchpad.net/~thv\n  Ville-Pekka Vainio https://launchpad.net/~vpvainio\n  papukaija https://launchpad.net/~papukaija"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Tilille %s tehtyjä muutoksia ei ole tallennettu."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Uutta tiliäsi ei ole vielä tallennettu."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1164
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Yhdistetään…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Poissa linjoilta — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Yhteys katkaistu — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Poissa linjoilta — Ei verkkoyhteyttä"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Poissa linjoilta — Tili ei ole käytettävissä"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Muokkaa yhteyden asetuksia"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Henkilökohtaisten tietojesi nouto palvelimelta epäonnistui."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"Olet luomassa uutta käyttäjätiliä. Uuden tilin luonti hylkää\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Muokkaa yhteyden asetuksia..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Haluatko poistaa tilin ”%s” tietokoneeltasi?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Tämä ei poista tiliäsi palvelimelta."
 
-#: ../src/empathy-accounts-dialog.c:1432
-msgid ""
-"You are about to select another account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Olet vaihtamassa käyttäjätiliä. Tilin vaihtamineen hylkää\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
+#: ../src/empathy-accounts-dialog.c:1562
+msgid "You are about to select another account, which will discard\nyour changes. Are you sure you want to proceed?"
+msgstr "Olet vaihtamassa käyttäjätiliä. Tilin vaihtamineen hylkää\ntehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
-msgstr ""
+msgstr "Ota _käyttöön"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
-msgstr ""
+msgstr "Ota _pois käytöstä"
 
-#: ../src/empathy-accounts-dialog.c:2154
-msgid ""
-"You are about to close the window, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkää\n"
-"tehdyt muutokset. Haluatko varmasti jatkaa?"
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "O_hita"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Yhdistä"
+
+#: ../src/empathy-accounts-dialog.c:2303
+msgid "You are about to close the window, which will discard\nyour changes. Are you sure you want to proceed?"
+msgstr "Olet sulkemassa ikkunan. Ikkunan sulkeminen hylkää\ntehdyt muutokset. Haluatko varmasti jatkaa?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Add…"
 msgstr "Lisää..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Ladataan tilin tietoja"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Protokollaa ei ole asennettu"
+msgid "_Import…"
+msgstr "_Tuo…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Yhteyskäytäntö:"
+msgid "Loading account information"
+msgstr "Ladataan tilin tietoja"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr ""
-"Ennen kuin voit lisätä tilin, sinun täytyy asentaa kullekin käytettävälle "
-"protokollalle tarvittava taustajärjestelmä."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "To add a new account, you first have to install a backend for each protocol you want to use."
+msgstr "Ennen kuin voit lisätä tilin, sinun täytyy asentaa kullekin käytettävälle protokollalle tarvittava taustajärjestelmä."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Tuo…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Yhteyskäytäntötaustaosia ei asennettu"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathyn tunnistautumisasiakas"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Lähellä olevat ihmiset"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:127
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathyn audio/video-asiakas"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:152
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathyn audio/video-asiakas"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrasti"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Kirkkaus"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Äänisyöte"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videosyöte"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Valintalevy"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Tiedot"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1672
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Soita tuttavalle %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:1916
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Tämän koneen näkemä IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:1918
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internetissä olevan palvelimen näkemä IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:1920
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Vertaisen IP-osoite toiselta puolen nähtynä"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:1922
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Välityspalvelimen IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:1924
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Ryhmälähetysryhmän IP-osoite"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Yhdistetty -- %d:%02d min"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2674
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tekniset tiedot"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2712
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
+msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "%s:n ohjelmisto ei ymmärrä mitään äänimuotoja mitä tietokoneesi tukee"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2717
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
+msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "%s:n ohjelmisto ei ymmärrä mitään videomuotoja mitä tietokoneesi tukee"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2723
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"Yhteyttä ei voi muodostaa kohteeseen %s. Yksi teistä voi ehkä olla verkossa, "
-"joka ei salli suoria yhteyksiä."
+msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
+msgstr "Yhteyttä ei voi muodostaa kohteeseen %s. Yksi teistä voi ehkä olla verkossa, joka ei salli suoria yhteyksiä."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2729
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Verkkoyhteydessä tapahtui virhe"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2733
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr ""
-"Tähän puheluun vaadittavia äänitiedostomuotoja ei ole asennettu tälle "
-"tietokoneelle"
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "Tähän puheluun vaadittavia äänitiedostomuotoja ei ole asennettu tälle tietokoneelle"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2736
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr ""
-"Tähän puheluun vaadittavia videotiedostomuotoja ei ole asennettu tälle "
-"tietokoneelle"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "Tähän puheluun vaadittavia videotiedostomuotoja ei ole asennettu tälle tietokoneelle"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2748
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvä ja <a "
-"href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-"
-"ikkunasta kerätyt lokit \"Apua\"-valikosta."
+msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
+msgstr "Telepathy-komponentin kanssa tapahtui jotain odottamatonta. Ole hyvä ja <a href=\"%s\">raportoi tämä ohjelmavirhe</a> sekä liitä 'Vianjäljitys'-ikkunasta kerätyt lokit \"Apua\"-valikosta."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2757
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Virhe soitettaessa"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2760
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Virran loppu saavutettiin"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2800
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ääniyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2810
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Videoyhteyden muodostus ei onnistunut"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Ääni"
+msgid "_Call"
+msgstr "_Soita"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Purkamiskoodekki:"
+msgid "_Microphone"
+msgstr "_Mikrofoni"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr ""
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "A_setukset"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Pakkauskoodekki:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Näytä"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Katkaise"
+#: ../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 "O_hje"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Lopeta nykyinen puhelu"
+#: ../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 "_Sisältö"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Paikallisehdokas:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Vianetsintä"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr ""
+msgid "Swap camera"
+msgstr "Vaihda kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Etäehdokas:"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Lähetä ääntä"
+msgid "Disable camera"
+msgstr "Ota kamera pois käytöstä"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Lähetä video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Katkaise"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Lopeta nykyinen puhelu"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videopuhelu"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Aloita videopuhelu"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Aloita äänipuhelu"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Vaihda kamera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Äänen lähetys päälle/pois"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr ""
+msgid "Show dialpad"
+msgstr "Näytä numeronäppäimet"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2307 ../src/empathy-call-window.c:2308
-#: ../src/empathy-call-window.c:2309 ../src/empathy-call-window.c:2310
-msgid "Unknown"
-msgstr "Tuntematon"
+msgid "Display the dialpad"
+msgstr "Näytä numeronäppäimistö"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Lähetä video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videopuhelu"
+msgid "Toggle video transmission"
+msgstr "Kytke videon lähetys päälle tai pois"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Soita"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Lähetä ääntä"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr ""
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Sisältö"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Äänen lähetys päälle/pois"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Vianetsintä"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Pakkauskoodekki:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "O_hje"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Purkamiskoodekki:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Etäehdokas:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr ""
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Paikallisehdokas:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Näytä"
+msgid "Audio"
+msgstr "Ääni"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Suljetaanko tämä ikkuna?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:305
+#, c-format, invalid-plural
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Poistutaanko huoneesta %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Sulje ikkuna"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Poistu huoneesta"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d lukematon)"
 msgstr[1] "%s (%d lukematonta)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ja %u muu)"
 msgstr[1] "%s (ja %u muuta)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d lukematon muilta)"
 msgstr[1] "%s (%d lukematonta muilta)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d lukematon kaikilta)"
 msgstr[1] "%s (%d lukematonta kaikilta)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Lähetetään %d viesti"
+msgstr[1] "Lähetetään %d viestiä"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Kirjoittaa viestiä."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Tyhjennä"
+msgid "_Conversation"
+msgstr "_Keskustelu"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "T_uttava"
+msgid "C_lear"
+msgstr "_Tyhjennä"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Lisää _hymiö"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Suosikkikeskusteluhuone"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Kutsu _osallistuja…"
+msgid "Notify for All Messages"
+msgstr "Ilmoita kaikista viesteistä"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Siirrä välilehti _vasemmalle"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Näytä tuttavaluettelo"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Siirrä välilehti _oikealle"
+msgid "Invite _Participant…"
+msgstr "Kutsu _osallistuja…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Ilmoita kaikista viesteistä"
+msgid "C_ontact"
+msgstr "T_uttava"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Keskustelu"
+msgid "_Tabs"
+msgstr "V_älilehdet"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Irrota välilehti"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Suosikkikeskusteluhuone"
+msgid "_Previous Tab"
+msgstr "_Edellinen välilehti"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Seuraava välilehti"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Edellinen välilehti"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Kumoa Sulje välilehti"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Näytä tuttavaluettelo"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Siirrä välilehti _vasemmalle"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "V_älilehdet"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Siirrä välilehti _oikealle"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Kumoa Sulje välilehti"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Irrota välilehti"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3760,203 +3439,204 @@ msgstr "Huone"
 msgid "Auto-Connect"
 msgstr "Yhdistä automaattisesti"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Hallitse suosikkihuoneita"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Saapuva videopuhelu"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s soittaa videopuhelun sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s soittaa sinulle. Haluatko vastata?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763
+#: ../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 "Puhelu käyttäjältä %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Hylkää"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Vastaa"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Vastaa käyttäen videota"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../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 "Saapuva videopuhelu taholta %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Kutsu huoneeseen"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Kutsu liittyä kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s kutsui sinut liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Sinut on kutsuttu liittymään kohteeseen %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Saapuva tiedostonsiirto tuttavalta %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Salasana vaaditaan"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "%s haluaa luvan nähdä, milloin olet linjoilla"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
-msgid ""
-"\n"
-"Message: %s"
-msgstr ""
-"\n"
-"Viesti: %s"
+msgid "\nMessage: %s"
+msgstr "\nViesti: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s nopeudella %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Vastaanotetaan \"%s\" tuttavalta %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Lähetetään \"%s\" tuttavalle %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Virhe vastaanotettaessa \"%s\" tuttavalta %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Virhe vastaanotettaessa tiedostoa"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Virhe lähetettäessä \"%s\" tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Virhe lähetettäessä tiedostoa"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" vastaanotettu tuttavalta %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" lähetetty tuttavalle %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Tiedostonsiirto valmistui"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Odotetaan toisen osallistujan vastausta"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Tarkistetaan tiedoston ”%s” eheyttä"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Lasketaan tiivistettä tiedostolle ”%s”"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Jäljellä"
 
@@ -3968,842 +3648,767 @@ msgstr "Tiedostosiirrot"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Poista valmiit, perutut ja epäonnistuneet tiedostonsiirrot luettelosta"
 
-#: ../src/empathy-import-dialog.c:84
-msgid ""
-"No accounts to import could be found. Empathy currently only supports "
-"importing accounts from Pidgin."
-msgstr ""
-"Tuotavia tilejä ei löytynyt. Empathy osaa tällä hetkellä tuoda tilejä "
-"ainoastaan Pidginistä."
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Tuo"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:88
+msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
+msgstr "Tuotavia tilejä ei löytynyt. Empathy osaa tällä hetkellä tuoda tilejä ainoastaan Pidginistä."
+
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Tuo tilejä"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Tuo"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Lähde"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Anna salasana"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Vastinetta ei löytynyt"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Päivitä sovellus..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Sulje"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Yhdistä uudelleen"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Muokkaa tiliä"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Sulje"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr ""
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Tuttava"
 
-#: ../src/empathy-main-window.c:2119
-msgid "Contact List"
-msgstr "Tuttavaluettelo"
-
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Tuttavat _kartalla"
-
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
 msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Etsi _tuttavaluettelosta"
+#. 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 ""
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Liity _suosikkeihin"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "Tuttavaluettelo"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Hallitse suosikkeja"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Tilin asetukset"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Normaali koko"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Uusi keskustelu…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "Uusi _puhelu…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normaali koko _avatarien kera"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "Etsi _yhteystietoja..."
 
-#: ../src/empathy-main-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Asetukset"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Tiedostosiirrot"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Poissa linjoilta olevat tuttavat"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "Näytä p_rotokollat"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Lajittele _nimen mukaan"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Lajittele _tilan mukaan"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Tuttavat _kartalla"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Käyttäjätilit"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Estetyt yhteystiedot"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Tiivis koko"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_Asetukset"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Tiedostosiirrot"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Etsi _tuttavaluettelosta"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_Liity…"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Lajittele _nimen mukaan"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Uusi keskustelu…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Lajittele _tilan mukaan"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Poissa linjoilta olevat tuttavat"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normaali koko _avatarien kera"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Henkilötiedot"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "_Normaali koko"
 
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Tiivis koko"
+
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Huone"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "Etsi _yhteystietoja..."
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "_Liity…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Liity _suosikkeihin"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Hallitse suosikkeja"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Keskusteluhuone"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Jäsenet"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
-msgid ""
-"%s\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"%s\n"
-"Vaaditaan kutsu: %s\n"
-"Vaaditaan salasana: %s\n"
-"Jäseniä: %s"
+msgid "%s\nInvite required: %s\nPassword required: %s\nMembers: %s"
+msgstr "%s\nVaaditaan kutsu: %s\nVaaditaan salasana: %s\nJäseniä: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ei"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ei voitu aloittaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ei voitu lopettaa huoneluettelointia"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ei voitu ladata huoneluetteloa"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Liity huoneeseen"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"Anna liityttävän huoneen nimi tai napsauta yhtä tai useampaa huonetta "
-"luettelosta."
+msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgstr "Anna liityttävän huoneen nimi tai napsauta yhtä tai useampaa huonetta luettelosta."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr ""
-"Anna palvelin, jolta huone löytyy, tai jätä tyhjäksi jos huone on tilin "
-"nykyisellä palvelimella"
+msgid "_Room:"
+msgstr "_Keskusteluhuone:"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Liity huoneeseen"
+msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
+msgstr "Anna palvelin, jolta huone löytyy, tai jätä tyhjäksi jos huone on tilin nykyisellä palvelimella"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ei voitu ladata huoneluetteloa"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Huoneluettelo"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Keskusteluhuone:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Viesti vastaanotettu"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Uusi keskustelu"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "Tuttava saapui linjoille"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Tuttava saapuu linjoille"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Tuttava poistui linjoilta"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Tili yhdistetty"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Tilin yhteys katkaistu"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Kieli"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
-msgstr ""
+msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
-msgstr ""
+msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "Romeo, Romeo. missä olet Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr ""
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Asetukset"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Näytä _hymiöt hymiökuvakkeina"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Näytä tuttava_luettelo huoneissa"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Ulkoasu"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Käytös"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Avaa keskustelut:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Keskustelun _teema:"
+msgid "new ta_bs"
+msgstr "uu_siin välilehtiin"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Poista huomautukset käytöstä oltaessa _poissa tai kiireinen"
+msgid "new _windows"
+msgstr "uusiin _ikkunoihin"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Näytä tulevat tapahtumat tilarivillä"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Yhdistä automaattisesti käynnistyksen yhteydessä"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when a contact comes online"
-msgstr "Näytä ponnahdusikkuna, kun tuttava tulee linjoille"
+msgid "Log conversations"
+msgstr "Tallenna keskustelut lokitiedostoon"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact goes offline"
-msgstr "Näytä ponnahdusikkuna, kun tuttava lähtee linjoilta"
+msgid "Behavior"
+msgstr "Käytös"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Näytä huomautuksia, kun _keskustelu ei ole kohdistettu"
+msgid "General"
+msgstr "Yleinen"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable spell checking for languages:"
-msgstr "Käytä kielentarkistusta kielille:"
+msgid "_Enable bubble notifications"
+msgstr "_Käytä ponnahdusikkunahuomautuksia"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "General"
-msgstr "Yleinen"
+msgid "Disable notifications when _away or busy"
+msgstr "Poista huomautukset käytöstä oltaessa _poissa tai kiireinen"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Input level"
-msgstr ""
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Näytä huomautuksia, kun _keskustelu ei ole kohdistettu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input volume"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "Näytä ponnahdusikkuna, kun tuttava tulee linjoille"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "Näytä ponnahdusikkuna, kun tuttava lähtee linjoilta"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Location sources:"
-msgstr "Sijainti:"
+msgid "Notifications"
+msgstr "Huomautukset"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Log conversations"
-msgstr "Tallenna keskustelut lokitiedostoon"
+msgid "_Enable sound notifications"
+msgstr "_Käytä merkkiääniä"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Notifications"
-msgstr "Huomautukset"
+msgid "Disable sounds when _away or busy"
+msgstr "Poista äänet käytöstä oltaessa _poissa tai kiireinen"
 
 #: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Soita ääniä tapahtumille"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Privacy"
-msgstr "Yksityisyys"
+msgid "Sounds"
+msgstr "Äänet"
 
 #: ../src/empathy-preferences.ui.h:22
-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 ""
-"Heikennetty sijaintitiedon tarkkuus tarkoittaa, että ainoastaan kaupunkisi "
-"ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Käytä _kaiunpoistoa puhelun laadun parantamiseksi"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show _smileys as images"
-msgstr "Näytä _hymiöt hymiökuvakkeina"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show contact _list in rooms"
-msgstr "Näytä tuttava_luettelo huoneissa"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Sounds"
-msgstr "Äänet"
+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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Kaiun poisto tekee äänestäsi selkeämmän vastapuolen päässä, mutta siitä saattaa seurata ongelmia joillain tietokoneilla. Jos vastapuoli kuulee outoja ääniä puhelun aikana, kokeile poistaa kaiun poisto käytöstä ja soittaa puhelu uudelleen."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Spell Checking"
-msgstr "Kielentarkastus"
+msgid "_Publish location to my contacts"
+msgstr "_Julkaise sijainti tuttavilleni"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr ""
-"Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on "
-"asennettu sanakirja."
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Themes"
-msgstr "Teemat"
+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 "Heikennetty sijaintitiedon tarkkuus tarkoittaa, että ainoastaan kaupunkisi ja maasi julkaistaan. GPS-koordinaattien tarkkuus on yksi desimaali."
 
+#. 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 "Variant:"
-msgstr "Muunnelma:"
+msgid "_Reduce location accuracy"
+msgstr "_Heikennä sijaintitiedon tarkkuutta"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_Yhdistä automaattisesti käynnistyksen yhteydessä"
+msgid "Privacy"
+msgstr "Yksityisyys"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Matkapuhelin"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Käytä ponnahdusikkunahuomautuksia"
+msgid "_Cellphone"
+msgstr "_Matkapuhelin"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Käytä merkkiääniä"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Verkko (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Sijainti:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Avaa uusi ikkuna uusille keskusteluille"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Luettelo kielistä sisältää ainoastaan ne kielet, joille tietokoneessasi on asennettu sanakirja."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Julkaise sijainti tuttavilleni"
+msgid "Enable spell checking for languages:"
+msgstr "Käytä kielentarkistusta kielille:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Kielentarkastus"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "_Heikennä sijaintitiedon tarkkuutta"
+msgid "Chat Th_eme:"
+msgstr "Keskustelun _teema:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Muunnelma:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teemat"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Soita tuttavalle uudelleen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera pois"
+msgid "Redial"
+msgstr "Yhdistä uudelleen"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera päällä"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video pois"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kytke kamera poista käytöstä ja lopeta videokuvan lähetys"
+msgid "Video Preview"
+msgstr "Videon esikatselu"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ota kamera käyttöön ja lähetä videokuvaa"
+msgid "Video On"
+msgstr "Video päällä"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Soita tuttavalle uudelleen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Esikatselu"
+msgid "Camera Off"
+msgstr "Kamera pois"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Yhdistä uudelleen"
+msgid "Disable camera and stop sending video"
+msgstr "Kytke kamera poista käytöstä ja lopeta videokuvan lähetys"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Esikatselu"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video pois"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Ota kamera käyttöön, mutta älä lähetä videokuvaa"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video päällä"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera päällä"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videon esikatselu"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Ota kamera käyttöön ja lähetä videokuvaa"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Tuttavien karttanäkymä"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin-linkki"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin-vastaus"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Vianetsintäikkuna"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Lähetä pastebin-palveluun"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pysäytä"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Taso "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Virheenjäljitys"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Tietoa"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Viesti"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kriittinen"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Aika"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Alue"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Luokka"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Taso"
 
-#: ../src/empathy-debug-window.c:1642
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
+#: ../src/empathy-debug-window.c:2114
+msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Valittu yhteyshallinta ei tue etävianetsintälaajennusta."
 
-#: ../src/empathy-invite-participant-dialog.c:205
-#: ../src/empathy-invite-participant-dialog.c:231
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Kutsu osanottaja"
 
-#: ../src/empathy-invite-participant-dialog.c:206
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Valitse keskusteluun kutsuttava tuttava:"
 
-#: ../src/empathy-invite-participant-dialog.c:227
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Kutsu"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"Älä näytä mitään valintaikkunoita; tee mitä tahansa työtä (esim. tuonti) ja "
-"poistu"
+msgstr "Älä näytä mitään valintaikkunoita; tee mitä tahansa työtä (esim. tuonti) ja poistu"
 
-#: ../src/empathy-accounts.c:187
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Valitse tili alussa (esim. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<käyttäjätunnus>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-tilit"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-tilit"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
-msgstr ""
+msgstr "Näytä tietty palvelu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr ""
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathyn virheenjäljitin"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy-keskusteluasiakas"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Vastaa"
 
-#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Hylkää"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Vastaa"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Vastaa videon kanssa"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Kieltäydy"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../src/empathy-notifications-approver.c:260
+#. 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 ""
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
+msgstr "%s yritti juuri soittaa sinulle, mutta sinulla oli toinen puhelu kesken."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1036 ../src/empathy-call-window.c:1059
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2603
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Pidossa"
 
-#: ../src/empathy-call-window.c:2606
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Vaimenna"
 
-#: ../src/empathy-call-window.c:2608
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Kesto"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2611
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
 msgstr ""
 
-#~ msgid "%s is sending you a file. Do you want to accept it?"
-#~ msgstr "%s haluaa lähettää sinulle tiedoston. Haluatko vastaanottaa sen?"
-
-#~ msgid "_Accept"
-#~ msgstr "_Hyväksy"
-
-#~ msgid "Empathy has asked about importing accounts"
-#~ msgstr "Empathy on kysynyt tilien tuonnista"
-
-#~ msgid "All"
-#~ msgstr "Kaikki"
-
-#~ msgid "Select"
-#~ msgstr "Valitse"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Conversations"
-#~ msgstr "Keskustelut"
-
-#~ msgid "Previous Conversations"
-#~ msgstr "Aikaisemmat keskustelut"
-
-#~ msgid "_For:"
-#~ msgstr "_Ajalta:"
-
-#~ msgid "Show and edit accounts"
-#~ msgstr "Näytä ja muokkaa tilejä"
-
-#~ msgid "The hash of the received file and the sent one do not match"
-#~ msgstr "Vastaanotetun ja lähetetyn tiedoston tiiviste ei täsmää"
-
-#~ msgid "Enter Custom Message"
-#~ msgstr "Syötä itse määritelty viesti"
-
-#~ msgid "Add _New Preset"
-#~ msgstr "Lisää _uusi esitieto"
-
-#~ msgid "Saved Presets"
-#~ msgstr "Tallennetut esitiedot"
-
-#~ msgid ""
-#~ "Whether Empathy has asked about importing accounts from other programs."
-#~ msgstr "Onko Empathy tiedustellut tilien tuomisesta."
-
-#~ msgid "Show incoming messages in the messaging menu"
-#~ msgstr "Näytä saapuvat viestit viestivalikossa"
-
-#~ msgid "Match case"
-#~ msgstr "Huomioi kirjainkoko"
-
-#~ msgid "_Add…"
-#~ msgstr "_Lisää…"
-
-#~ msgid "Find Next"
-#~ msgstr "Etsi seuraava"
-
-#~ msgid "Find Previous"
-#~ msgstr "Etsi edellinen"
-
-#~ msgid "The certificate has expired"
-#~ msgstr "Varmenne on vanhentunut"
-
-#~ msgid ""
-#~ "The certificate has been revoked by the issuing Certification Authority"
-#~ msgstr "Varmenne on peruutettu varmenteen myöntäjän toimesta"
-
-#~ msgid "The certificate hasn't yet been activated"
-#~ msgstr "Varmennetta ei ole vielä aktivoitu"
-
-#~ msgid "The certificate is self-signed"
-#~ msgstr "Varmenne on itsetehty"
-
-#~ msgid "The certificate is malformed"
-#~ msgstr "Varmenne on muodostettu väärin"
-
-#~ msgid "The identity provided by the chat server cannot be verified.\n"
-#~ msgstr "Keskustelupalvelimen antamaa tunnistetta ei voida varmistaa.\n"
-
-#~ msgid "The certificate is cryptographically weak"
-#~ msgstr "Varmenteen salausmenetelmä on heikko"
-
-#~ msgid ""
-#~ "The hostname verified by the certificate doesn't match the server name"
-#~ msgstr ""
-#~ "Varmenteessa ilmoitettu isäntänimi ei täsmää palvelimen nimen kanssa"
-
-#~ msgid "The certificate length exceeds verifiable limits"
-#~ msgstr "Varmenteen pituus ylittää sallitut rajat"
-
-#~ msgid "_Enabled"
-#~ msgstr "_Käytössä"
-
-#~ msgid "Meta-contact containing %u contact"
-#~ msgid_plural "Meta-contact containing %u contacts"
-#~ msgstr[0] "Metayhteystieto, joka sisältää %u yhteystiedon"
-#~ msgstr[1] "Metayhteystieto, joka sisältää %u yhteystietoa"
-
-#~ msgid ""
-#~ "Completely split the displayed meta-contact into the contacts it contains."
-#~ msgstr "Jaa näytettävä metayhteystieto sen sisältämiin yhteystietoihin."
-
-#~ msgid "Unlink meta-contact '%s'?"
-#~ msgstr "Poistetaanko metayhteystiedon ”%s” linkitys?"
-
-#~ msgid ""
-#~ "Are you sure you want to unlink this meta-contact? This will completely "
-#~ "split the meta-contact into the contacts it contains."
-#~ msgstr ""
-#~ "Haluatko varmasti poistaa tämän metayhteystiedon linkityksen? "
-#~ "Metayhteystieto jaetaan sen sisältämiin yhteystietoihin."
-
-#~ msgid "The certificate is not signed by a Certification Authority"
-#~ msgstr "Varmennetta ei ole virallisesti allekirjoitettu"
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr ""
 
-#~ msgid "The certificate does not have the expected fingerprint"
-#~ msgstr "Varmenteessa ei ole odotettua sormenjälkeä"
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr ""
 
-#~ msgid "Don't display any dialogs if there are any non-Salut accounts"
-#~ msgstr ""
-#~ "Älä näytä mitään valintaikkunoita, paitsi jos käytössä on vain ”Lähellä "
-#~ "olevat ihmiset” -tilejä"
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "_Huomioi kirjainkoko"
 
-#~ msgid "Are you sure you want to remove '%s' from your contacts?"
-#~ msgstr "Haluatko varmasti poistaa kohteen '%s' yhteystiedoistasi?"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Minkä tyyppinen pikaviestintili sinulla on?"
 
-#~ msgid "Your software is too old"
-#~ msgstr "Sovelluksesi on liian vanha"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Lisätään uutta tiliä"
 
-#~ msgid "Update software..."
-#~ msgstr "Päivitä sovellus..."
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Lähellä olevat ihmiset"
 
-#~ msgid "Unavailable"
-#~ msgstr "Ei käytettävissä"
+#: ../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."
+msgstr "Empathy voi automaattisesti löytää ja keskustella kanssasi samaan verkkoon yhdistettyjen ihmisten kanssa. Jos haluat käyttää tätä toimintoa, tarkista että alla olevat tiedot ovat oikein."
 
-#~ msgid "Off"
-#~ msgstr "Kiinni"
+#: ../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 "Voit muuttaa näitä tietoja myöhemmin tai poistaa tämän ominaisuuden käytöstä valitsemalla tuttavaluettelossa <span style=\"italic\">Muokkaa → Käyttäjätilit</span>."
 
-#~ msgid "On"
-#~ msgstr "Päällä"
diff --git a/po/gl.po b/po/gl.po
index 9d4404c37..b5f491759 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy-master-po-gl-57278_.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-15 15:44+0100\n"
-"PO-Revision-Date: 2012-01-15 15:45+0100\n"
+"POT-Creation-Date: 2012-03-07 12:50+0100\n"
+"PO-Revision-Date: 2012-03-07 12:52+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
@@ -30,16 +30,25 @@ msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "IM Client"
-msgstr "Cliente de MI"
+msgstr "Cliente de mensaxaría instantánea"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Mensaxaría na Internet Empathy"
+msgstr "Mensaxaría instantánea Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Converse en Google Talk, Facebook, MSN e moitos máis servizos de conversa"
+msgstr "Converse en Google Talk, Facebook, MSN e moitos máis servizos de chat"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de mensaxaría e Voz IP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Xestionar as contas de mensaxaría e Voz IP"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
@@ -52,33 +61,33 @@ msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"Indica se deberían usarse xestores de conectividade para conectarse ou "
-"desconectarse automaticamente ou non."
+"Indica se se deberían usar xestores de conectividade para desconectarse/"
+"reconectarse automaticamente ou non."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Empathy should auto-connect on startup"
-msgstr "O Empathy debería conectarse automaticamente ao inicio"
+msgstr "Empathy debería autoconectarse ao inicio"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
-"Indica se o Empathy debería iniciar a sesión nas súas contas automaticamente "
-"ao inicio ou non."
+"Indica se Empathy debería iniciar a sesión nas súas contas automaticamente "
+"ao inicio."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Empathy should auto-away when idle"
-msgstr "O Empathy debería pórse automaticamente en ausente ao estar inactivo"
+msgstr "Empathy debería mostrar ausencia ao estar inactivo"
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Indica se o Empathy debería pórse no estado de ausente se o usuario está "
-"inactivo."
+"Indica se o Empathy debería entrar en modo de ausencia automaticamente se o "
+"usuario está inactivo."
 
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
@@ -88,100 +97,112 @@ msgstr "Cartafol de descargas predeterminado do Empathy"
 # rever
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "The default folder to save file transfers in."
+msgstr "O cartafol predeterminado no que gardar os ficheiros transferidos."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"O cartafol predeterminado en que gardar as transferencias de ficheiros."
+"Número máxico usado para comprobar se se deben executar as tarefas de limpeza"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+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."
+msgstr ""
+"empathy-sanity-cleanin.c usa este número para comprobar se se deben executar "
+"as tarefas de limpeza. Os usuarios non deben cambiar esta chave manualmente."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Show offline contacts"
-msgstr "Mostrar os contactos desconectados"
+msgstr "Mostrar contactos desconectados"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
-"Indica se mostrar ou non os contactos que están desconectados na lista de "
+"Indica se se debe mostrar os contactos que están desconectados na lista de "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Show avatars"
-msgstr "Mostrar os avatares"
+msgstr "Mostrar avatares"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
-"Indica se mostrar ou non os avatares dos contactos da lista de contactos e "
+"Indica se se deben mostrar os avatares dos contactos na lista de contactos e "
 "das xanelas de conversa."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Show protocols"
-msgstr "Mostrar os protocolos"
+msgstr "Mostrar protocolos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
-"Indica se mostrar ou non os protocolos para os contacto na lista de "
+"Indica se se deben mostrar os protocolos para os contactos na lista de "
 "contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Show Balance in contact list"
-msgstr "Mostrar o balance na lista de contactos"
+msgstr "Mostrar crédito na lista de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Whether to show account balances in the contact list."
-msgstr "Indica se mostrar ou non os balances na lista de contactos."
+msgstr "Indica se se debe mostrar o crédito na lista de contactos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Compact contact list"
-msgstr "Lista de contactos compacta"
+msgstr "Lista compacta de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Whether to show the contact list in compact mode."
-msgstr "Indica se mostrar ou non a lista de contactos no modo compacto."
+msgstr "Indica se se debe mostrar a lista de contactos en modo compacto."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Hide main window"
-msgstr "Agochar a xanela principal"
+msgstr "Ocultar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Hide the main window."
-msgstr "Agochar a xanela principal."
+msgstr "Ocultar a xanela principal."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Default directory to select an avatar image from"
-msgstr "O cartafol predeterminado desde o que seleccionar unha imaxe de avatar"
+msgstr "Cartafol predeterminado para seleccionar un avatar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "The last directory that an avatar image was chosen from."
-msgstr "O último cartafol desde onde foi escollida unha imaxe de avatar."
+msgstr "Último cartafol do que escolleu unha imaxe de avatar."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Open new chats in separate windows"
 msgstr "Abrir as novas conversas en xanelas separadas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Always open a separate chat window for new chats."
-msgstr "Abrir sempre unha xanela de conversa á parte para as conversas novas."
+msgstr "Abrir sempre unha xanela de conversa separada para as conversas novas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Display incoming events in the status area"
-msgstr "Mostrar os eventos de entrada na área de estado"
+msgstr "Mostrar os eventos entrantes na área de estado"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -189,160 +210,169 @@ msgstr ""
 "Mostrar os eventos entrantes na área de estado. Se é falso mostrarllos "
 "directamente ao usuario."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "The position for the chat window side pane"
 msgstr "A posición do panel lateral da xanela de conversa"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "A posición almacenada (en píxeles) do panel lateral da xanela de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Show contact groups"
+msgstr "Mostrar grupos de contactos"
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to show groups in the contact list."
+msgstr "Indica se se deben mostrar os grupos na lista de contactos."
+
+# rever
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Contact list sort criterion"
 msgstr "Criterio de ordenación da lista de contactos"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
-"Que criterio usará ao ordenar a lista de contactos. O predeterminado é usar "
-"a ordenación polo nome do contacto co valor \"name\". Un valor de \"estado\" "
-"ordenará a lista de contactos por estado."
+"Que criterio usar ao ordenar a lista de contactos. O predeterminado é "
+"ordenar polo estado do contacto co valor «state» (estado). Un valor "
+"«name» (nome) ordenará a lista de contactos polo nome."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Use notification sounds"
 msgstr "Usar sons de notificación"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Whether to play a sound to notify of events."
-msgstr "Indica se reproducir ou non un son para notificar os eventos."
+msgstr "Indica se se debe reproducir un son para notificar os eventos."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Disable sounds when away"
-msgstr "Desactivar os sons cando se está ausente"
+msgstr "Desactivar os sons ao ausentarse"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
-"Indica se reproducir ou non un son para notificar cando se está ocupado ou "
+"Indica se se debe reproducir un son para notificar cando se está ocupado ou "
 "ausente."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
-msgstr "Reproducir un son para as mensaxes entrantes"
+msgstr "Reproducir un son cando cheguen mensaxes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Indica se reproducir ou non un son para notificar as mensaxes entrantes."
+msgstr "Indica se se debe reproducir un son para notificar mensaxes entrantes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
-msgstr "Reproducir un son para as mensaxes saíntes"
+msgstr "Reproducir un son ao enviar mensaxes"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Indica se reproducir ou non un son para notificar as mensaxes saíntes."
+msgstr ""
+"Indica se se debe reproducir un son para notificar as mensaxes saíntes."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound for new conversations"
 msgstr "Reproducir un son para as conversas novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Whether to play a sound to notify of new conversations."
-msgstr "Indica se reproducir ou non un son para notificar as conversas novas."
+msgstr "Indica se se debe reproducir un son para notificar as conversas novas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs in"
-msgstr "Reproducir un son cando un contacto inicia unha sesión"
+msgstr "Reproducir un son cando un contacto inicie sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos inician "
-"unha sesión na rede."
+"Indica se se debe reproducir un son para notificar os inicio de sesión dos "
+"contactos na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when a contact logs out"
 msgstr "Reproducir un son cando un contacto saia da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
-"Indica se reproducir ou non un son para notificar que os contactos terminan "
+"Indica se se debe reproducir un son para notificar que os contactos terminan "
 "unha sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log in"
-msgstr "Reproducir un son cando iniciamos a sesión"
+msgstr "Reproducir un son cando inicio sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Whether to play a sound when logging into a network."
-msgstr ""
-"Indica se reproducir ou non un son cando se inicia unha sesión na rede."
+msgstr "Indica se se debe reproducir un son cando se inicia sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Play a sound when we log out"
-msgstr "Reproducir un son cando saímos da sesión"
+msgstr "Reproducir un son cando ao saír da sesión"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Whether to play a sound when logging out of a network."
-msgstr "Indica se reproducir ou non un son cando se sae da sesión na rede."
+msgstr "Indica se se debe reproducir un son cando se sae da sesión na rede."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Enable popup notifications for new messages"
 msgstr "Activar as notificacións emerxentes para as mensaxes novas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando se reciba unha "
 "mensaxe nova."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Disable popup notifications when away"
 msgstr "Desactivar as notificacións emerxentes cando se está ausente"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrar ou non as notificacións emerxentes cando se está ausente "
 "ou ocupado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Facer emerxer unha notificación cando a conversa non está enfocada"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -351,110 +381,122 @@ msgstr ""
 "mensaxe nova, aínda cando a conversa xa estea aberta mais non estea enfocada."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Pop up notifications when a contact logs in"
 msgstr "Facer emerxer unha notificación cando un contacto entra"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "conectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Pop up notifications when a contact logs out"
 msgstr "Facer emerxer unha notificación cando un contacto sae"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrar ou non unha notificación emerxente cando un contacto está "
 "desconectado."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Usar emoticonas gráficas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se converter ou non as emoticonas en imaxes gráficas nas conversas."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Show contact list in rooms"
 msgstr "Mostrar a lista de contactos nas salas"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Indica se mostrar ou non a lista de contactos nas salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Chat window theme"
 msgstr "Tema da xanela de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "O tema usado para mostrar as conversa nas xanelas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Chat window theme variant"
 msgstr "Variante do tema da xanela de charla"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "A variante do tema que se usará para mostrar a conversa nas xanelas de chat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Path of the Adium theme to use"
 msgstr "Ruta do tema de Adium para usar"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../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."
 msgstr ""
 "Ruta do tema de Adium para usar se o tema usado para o chat é de Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Enable WebKit Developer Tools"
 msgstr "Activar as ferramentas de desenvolvedor WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica se as ferramentas de desenvolvedor WebKit, tales como Web Inspector, "
 "deberían ser activadas."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informar a outros usuarios cando vostede está escribindo"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Indica se enviar ou non os estados de conversa «escribindo» ou «pausado». No "
+"afecta realmente ao estado «ausente»."
+
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Use theme for chat rooms"
 msgstr "Usar un tema para as salas de conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usar ou non o tema para as salas de conversa."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Spell checking languages"
 msgstr "Idiomas para a corrección ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
@@ -462,12 +504,12 @@ msgstr ""
 "ex., «gl, pt, en»)."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Enable spell checker"
 msgstr "Activar a verificación ortográfica"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
@@ -475,12 +517,12 @@ msgstr ""
 "as quere verificar."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Nick completed character"
 msgstr "Carácter de completado de alcume"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -489,63 +531,63 @@ msgstr ""
 "alcume (tabulador) nunha conversa de grupo."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "O Empathy debería usar o avatar do contacto como a icona da xanela de "
 "conversa"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se o Empathy debería usar o avatar dos contactos como a icona da "
 "xanela da conversa ou non."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Last account selected in Join Room dialog"
 msgstr "Última conta seleccionada no diálogo Unirse á sala"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 "Ruta do obxecto D-Bus da última conta seleccionada para unirse a unha sala."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Camera device"
 msgstr "Dispositivo da cámara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
 "Dispositivo de cámara predeterminado para usar nas chamadas de vídeo, p.ex. /"
 "dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Camera position"
 msgstr "Posición da cámara"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Position the camera preview should be during a call."
 msgstr ""
 "Posición onde debe estar a vista previa da cámara durante unha chamada."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Echo cancellation support"
 msgstr "Compatibilidade de cancelación de eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Indica se activar o filtro de cancelación de eco de Pulseaudio."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Show hint about closing the main window"
 msgstr "Mostrar unha indicación sobre pechar a xanela principal"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -553,123 +595,113 @@ msgstr ""
 "Indica se mostrar ou non o diálogo de mensaxe sobre pechar a xanela "
 "principal co botón 'x' da barra de título."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Empathy can publish the user's location"
 msgstr "Empathy pode publicar a localización dos usuarios"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se o Empathy pode ou non publicar a localización do usuario aos seus "
 "contactos."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy pode usar a rede para adiviñar a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede para adiviñar a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy pode usar a rede de móbiles para seguir a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se o Empathy pode ou non usar a rede de telefonía móbil para adiviñar "
 "a localización."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy pode usar o GPS para seguir a localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se o Empathy pode usar ou non o GPS para adiviñar a localización."
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid "Empathy should reduce the location's accuracy"
 msgstr "O Empathy debería reducir a precisión da localización"
 
 # rever
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se o Empathy debería ou non reducir a precisión de localización por "
 "motivos de privacidade."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de mensaxaría e VoIP"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Xestionar as contas de mensaxaría e VoIP"
-
 # rever
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Non se especificou un motivo"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Foi solicitado o cambio de estado"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Vostede cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "O outro participante cancelou a transferencia de ficheiros"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Produciuse un erro ao tentar transferir o ficheiro"
 
 # rever
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "O outro participante non pode transferir o ficheiro"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Motivo descoñecido"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr ""
 "Completouse a transferencia de ficheiro pero o ficheiro está corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
-msgstr "A transferencia de ficheiro non é permitida polo contacto remoto"
+msgstr "O contacto remoto non admite a tranferencia de ficheiros"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "O ficheiro seleccionado non é un ficheiro regular"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "O ficheiro seleccionado está baleiro"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chamada perdida de %s"
@@ -685,238 +717,243 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dispoñíbel"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Non se especificou un motivo"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "O estado está definido a desconectado"
 
 # rever
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
 # rever
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Erro de cifrado"
 
 # rever
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome en uso"
 
 # rever
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
-msgstr "Non se proporcionou o certificado"
+msgstr "Non se forneceu o certificado"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
-msgstr "Certificado non fiábel"
+msgstr "Certificado sen confianza"
 
 # rever
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
-msgstr "O certificado caducou"
+msgstr "O certificado expirou"
 
 # rever
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "O certificado non está activado"
 
 # rever
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "O nome do host do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "A impresión dixital do certificado non coincide"
 
 # rever
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado autoasinado"
 
 # rever
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
-msgstr "Erro de certificado"
+msgstr "Erro do certificado"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "O cifrado non está dispoñíbel"
 
 # rever
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "O certificado non é válido"
 
 # rever
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Rexeitouse a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Non é posíbel estabelecer a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Perdeuse a conexión"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Este recurso xa está conectado ao servidor"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta conta xa está conectada ao servidor"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
-"A conexión foi substituída por unha nova conexión empregando o mesmo recurso"
+"A conexión foi substituída por unha conexión nova empregando o mesmo recurso"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
-msgstr "Nestes intres o servidor está moi ocupado para xesionar a conexión"
+msgstr ""
+"Nestes intres o servidor está demasiado ocupado para xestionar a conexión"
 
 # rever
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
-msgstr "O certificado foi revocado"
+msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa un algoritmo de cifrado inseguro ou cripotograficamente "
 "débil"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 "A lonxitude do certificado do servidor ou a profundidade da cadea do "
 "certificado do servidor excede os límites impostos pola biblioteca de "
-"criptografía."
+"criptografía"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "O seu software é demasiado antigo"
 
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Erro interno"
+
 # rever
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
-msgstr "Persoas próximas"
+msgstr "Xente cerca"
 
 # rever
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat de Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "Hai %d segundo"
-msgstr[1] "Hai %d segundos"
+msgstr[0] "hai %d segundo"
+msgstr[1] "hai %d segundos"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "Hai %d minuto"
-msgstr[1] "Hai %d minutos"
+msgstr[0] "hai %d minuto"
+msgstr[1] "hai %d minutos"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
-msgstr[0] "Hai %d hora"
-msgstr[1] "Hai %d horas"
+msgstr[0] "hai %d hora"
+msgstr[1] "hai %d horas"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
-msgstr[0] "Hai %d día"
-msgstr[1] "Hai %d días"
+msgstr[0] "hai %d día"
+msgstr[1] "hai %d días"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
-msgstr[0] "Hai %d semana"
-msgstr[1] "Hai %d semanas"
+msgstr[0] "hai %d semana"
+msgstr[1] "hai %d semanas"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
-msgstr[0] "Hai %d mes"
-msgstr[1] "Hai %d meses"
+msgstr[0] "hai %d mes"
+msgstr[1] "hai %d meses"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
-msgstr "Tódalas contas"
+msgstr "Todas as contas"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Conta"
 
@@ -934,30 +971,30 @@ msgstr "Servidor"
 msgid "Port"
 msgstr "Porto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
-msgstr "Nome de _usuario:"
+msgstr "Nome de usuario:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
-msgstr "A_plicar"
+msgstr "_Aplicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
-msgstr "Iniciar sesi_ón"
+msgstr "Iniciar _sesión"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta conta xa existe no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Crear unha nova conta no servidor"
 
@@ -967,20 +1004,20 @@ msgstr "Crear unha nova conta no servidor"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s sobre %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:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Conta %s"
 
 # rever
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Conta nova"
 
@@ -1013,7 +1050,7 @@ msgstr "<b>Exemplo:</b> MeuNomeEnPantalla"
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 #: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
-msgstr "Lembrar o contrasinal"
+msgstr "Lembrar contrasinal"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
@@ -1044,7 +1081,7 @@ msgstr "_Servidor:"
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
-msgstr "Avanzado"
+msgstr "Avanzadas"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
@@ -1073,7 +1110,7 @@ msgstr "I_D de sesión:"
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "<b>Example:</b> username"
-msgstr "<b>Exemplo:</b> nomeusuario"
+msgstr "<b>Exemplo:</b> usuario"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
@@ -1126,7 +1163,7 @@ msgstr "TLS"
 #. * best to keep the English version.
 #: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
-msgstr "Rexistrar"
+msgstr "Rexistrador"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
@@ -1214,7 +1251,7 @@ msgstr "Cal é o seu ID de Google?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Examplo:</b> usuario@gmail.com"
+msgstr "<b>Exemplo:</b> usuario@gmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
@@ -1227,7 +1264,7 @@ msgstr "<b>Exemplo:</b> user@jabber.org"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorar os erros do certificado SSL"
+msgstr "I_gnorar os erros de certificados SSL"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
@@ -1240,17 +1277,17 @@ msgstr "Rec_urso:"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "Encr_yption required (TLS/SSL)"
-msgstr "Requírese o c_ifrado (TLS/SSL)"
+msgstr "Require c_ifrado (TLS/SSL)"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "Use old SS_L"
-msgstr "Usar o SS_L antigo"
+msgstr "Usar SS_L antigo"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
-msgstr "Ignorar as configuracións do servidor"
+msgstr "Sobrescribir os axustes do servidor"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
@@ -1258,7 +1295,7 @@ msgstr "Cal é o seu identificador de Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
-msgstr "Cal é o ID de Jabber que desexa?"
+msgstr "Cal é o ID de usuario que quere para Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
 msgid "What is your Jabber password?"
@@ -1266,7 +1303,7 @@ msgstr "Cal é o seu contrasinal de Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
-msgstr "Cal é o contrasinal de Jabber que desexa?"
+msgstr "Cal é o contrasinal que desexa para Jabber?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
@@ -1274,11 +1311,11 @@ msgstr "<b>Exemplo:</b> usuario@hotmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
-msgstr "Cal é o seu contrasinal para Windows Live?"
+msgstr "Cal é o seu ID de Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
-msgstr "Cal é o seu contrasinal para Windows Live?"
+msgstr "Cal é o seu contrasinal de Windows Live?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
@@ -1299,7 +1336,7 @@ msgstr "Nome _publicado:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "ID para _Jabber:"
+msgstr "ID de _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "E-_mail address:"
@@ -1311,15 +1348,15 @@ msgstr "Nome de _usuario:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>Exemplo:</b> usuaruio@meu.servidor.sip"
+msgstr "<b>Exemplo:</b> usuario@meu.servidor.sip"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar esta conta para chamar a teléfonos _fixos e móbiles"
+msgstr "Usar esta conta para chamar a te_léfonos fixos e móbiles"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "NAT Traversal Options"
-msgstr "Opcións do NAT transversal"
+msgstr "Opcións de NAT transversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Proxy Options"
@@ -1349,7 +1386,7 @@ msgstr "Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Keep-Alive Options"
-msgstr "Opcións de Keep-Alive"
+msgstr "Opcións de «Keep-Alive»"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Mechanism:"
@@ -1369,11 +1406,11 @@ msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Loose Routing"
-msgstr "Enrutado aberto"
+msgstr "Enrutado impreciso"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "Ignore TLS Errors"
-msgstr "Ignorar os erros TLS"
+msgstr "Ignorar erros TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "Port:"
@@ -1395,7 +1432,7 @@ msgstr "I_D de Yahoo:"
 # rever
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
-msgstr "I_gnorar os convites para conferencias e salas de conversa"
+msgstr "I_gnorar convites a conferencias e salas de conversa"
 
 # rever
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
@@ -1408,7 +1445,7 @@ msgstr "Cal é o seu ID para Yahoo?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
-msgstr "Cal é o seu contrasinal para Yahoo?"
+msgstr "Cal é o seu contrasinal de Yahoo!?"
 
 # rever
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
@@ -1432,7 +1469,7 @@ msgstr "Seleccione a súa imaxe de avatar"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
-msgstr "Obter unha foto..."
+msgstr "Tomar unha foto…"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
@@ -1451,233 +1488,240 @@ msgstr "Todos os ficheiros"
 msgid "Click to enlarge"
 msgstr "Prema para ampliar"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Produciuse un erro ao iniciar a chamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "O contacto especificado non admite as chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "O contacto especificado está desconectado"
 
 # rever
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "O contacto especificado non é válido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Este protocolo non admite as chamadas de emerxencia"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Non ten crédito dabondo para facer esta chamada"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Produciuse un fallo ao abrir un chat privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
-msgstr "Ese asunto non se admite nesta conversación"
+msgstr "O asunto non é ocmpatíbel nesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Non se lle permite cambiar o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» non é un ID de contacto válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear, limpa todas as mensaxes da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>, estabelece o asunto da conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chatroom id>, unirse a unha nova sala de conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<chat room ID>] [<reason>]: abandonar a sala de char, por omisión a "
-"actual"
+"/part [<ID da sala de conversa>] [<razón>]: abandonar a sala de char, por "
+"omisión a actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr "/query <contact id> [<message>], abre unha conversa privada"
+msgstr "/query <id do contacto> [<mensaxe>], abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr "/msg <contact id> <message>, abre unha conversa privada"
+msgstr "/msg <id do contacto> <mensaxe>, abre unha conversa privada"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <nickname>, cambia o seu nome de usuario no servidor actual"
+msgstr "/nick <alcume>, cambia o seu nome de usuario no servidor actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <message>, envía unha mensaxe ACTION á conversa actual"
+msgstr "/me <mensaxe>, envía unha mensaxe ACTION á conversa actual"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
-"/say <message>, enviar <message> á conversa actual. Isto úsase para enviar "
+"/say <mensaxe>, enviar <mensaxe> á conversa actual. Isto úsase para enviar "
 "unha mensaxe que comeza cunha '/'. Por exemplo: \"/say /join úsase para "
 "unirse a unha nova sala de conversa\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contacto>: mostra información sobre un contacto"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<command>], mostra todas as ordes admitidas. Se <command> está "
-"definida, mostra o seu uso."
+"/help [<orde>], mostra todas as ordes admitidas. Se <orde> está definida, "
+"mostra o seu uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Orde descoñecida"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Orde descoñecida, vexa /help para obter as ordes dispoñíbeis"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "non ten balance suficiente para enviar a mensaxe"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Produciuse un erro ao enviar a mensaxe '%s': %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Produciuse un erro ao enviar a mensaxe: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "non ten balance dabondo para enviar a mensaxe <a href='%s'>Recargar</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "non é posíbel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
-msgstr "contacto incorrecto"
+msgstr "contacto non válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permiso denegado"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
-msgstr "a mensaxe é demasiado longa"
+msgstr "mensaxe é demasiado longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "non implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Asunto:"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Cambiouse o asunto a: %s"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tema estabelecido por %s a: %s"
+
+# rever
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
-msgstr "Non se definiu un asunto"
+msgstr "Non se definiu o asunto"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Sen suxestións)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Engadir «%s» ao dicionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Engadir «%s» ao dicionario de %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Inserir unha emoticona"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Suxestións de _ortografía"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Produciuse un fallo ao obter os rexistros recentes"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1685,12 +1729,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulsado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulsado"
@@ -1698,17 +1742,17 @@ msgstr "%s foi expulsado"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi vetado por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi excluído"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s deixou a sala"
@@ -1718,18 +1762,18 @@ msgstr "%s deixou a sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # rever
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s uniuse á sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora é coñecido como %s"
@@ -1737,55 +1781,55 @@ msgstr "%s agora é coñecido como %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Desexa gardar este contrasinal?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Agora non"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Reintentar"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "O contrasinal é incorrecto, ténteo de novo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Esta sala está protexida por un contrasinal:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Unirse"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1855,34 +1899,30 @@ msgstr "_Abrir a ligazón"
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Información persoal"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Contacto novo"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Desexa bloquear a %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 ""
 "Ten certeza de bloquear a «%s» para que non volva a contactar con vostede?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -2061,7 +2101,7 @@ msgstr "Altitude:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Localización"
 
@@ -2089,6 +2129,18 @@ msgstr "Gardar o avatar"
 msgid "Unable to save avatar"
 msgstr "Non foi posíbel gardar o avatar"
 
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalles persoais"
+
+# rever
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Detalles do contacto"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Nome completo"
@@ -2172,12 +2224,6 @@ msgstr "Alias:"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Localización</b> o (date)\t"
 
-# rever
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Detalles do contacto"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
@@ -2201,11 +2247,11 @@ msgstr "Versión:"
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2213,17 +2259,17 @@ msgstr ""
 "Seleccione os grupos en que quere que aparezan estes contactos. Note que "
 "pode seleccionar máis dun grupo ou ningún."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Eng_adir grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Seleccionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
@@ -2243,168 +2289,150 @@ msgstr[1] "Non é posíbel bloquear as seguintes identidades:"
 msgid "Edit Contact Information"
 msgstr "Editar a información de contacto"
 
-# rever
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contactos ligados"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Seleccione os contactos a ligar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Vista previa do contacto novo"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
-
 #. 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:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Seleccione a conta a usar para realizar a chamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Casa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Bloquear contacto"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Conversa"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Audiochamada"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videochamada"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 #: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Conversas _previas"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Compartir o meu escritorio"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorito"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts non está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Instale o programa gnome-contacts para acceder aos detalles dos contactos"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mación"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
 # rever
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Ligar contactos…"
-
-# rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Invítao a vostede a esta sala"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "Conv_idar a sala de conversa"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "Eng_adir un contacto…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Eliminar e _bloquear"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Está seguro de que quere eliminar o grupo '%s'?"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Eliminando o grupo"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Eliminar"
 
 # rever
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Está seguro de quere eliminar o contacto '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2413,7 +2441,7 @@ msgstr ""
 "Desexa eliminar o contacto ligado %s? Teña en conta que eliminaranse tamén "
 "todos os contactos que forman este contacto ligado."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Eliminando o contacto"
 
@@ -2458,181 +2486,137 @@ msgstr "servidor novo"
 msgid "SSL"
 msgstr "SSL"
 
-# rever
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Ligar contactos"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desligar…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Separar por completo o contacto ligado nos contactos que contén."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Ligar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desexa desligar os contactos ligados «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Está seguro que quere desligar estes contactos ligados? Isto separará por "
-"completo os contactos ligados en contactos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desligar"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historial"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversar en %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa con %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e de %B de %Y ás %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "A chamada levou %s, rematou ás %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hoxe"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Mañá"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e de %B de %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Calquera momento"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Calquera persoa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Quen"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Cando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Calquera cousa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:23
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Chamadas"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Chamadas entrantes"
 
 # rever
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Chamadas de voz saíntes"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Chamadas perdidas de %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ten certeza de eliminar tódolos rexistros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Limpar todo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Eliminar desde:"
 
@@ -2722,7 +2706,7 @@ msgid "There was an error starting the conversation"
 msgstr "Produciuse un erro ao iniciar a conversa"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Escriba o identificador dun contacto ou un número de teléfono:"
 
@@ -2732,17 +2716,17 @@ msgid "New Conversation"
 msgstr "Conversa nova"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "Chamada de _vídeo"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "Chamada de vo_z"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nova chamada"
 
@@ -2799,7 +2783,7 @@ msgstr "Mensaxes personalizadas…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Conta nova de %s"
@@ -2878,12 +2862,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensaxes personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensaxe editado ás %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2897,7 +2881,7 @@ msgstr "Simple"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
-msgstr "Limpo"
+msgstr "Limpar"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
@@ -2967,35 +2951,39 @@ msgid "Certificate hostname: %s"
 msgstr "Nome do servidor do certificado: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "C_ontinuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "A conexión non é confianza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "A conexión non confiábel. Desexa continuar de todas formas?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta elección para futuras conexións"
 
 # rever
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalles do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Non foi posíbel abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Non hai espazo suficiente para gardar o ficheiro"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3004,7 +2992,7 @@ msgstr ""
 "Requírense %s de espazo libre para gardar este ficheiro, pero só hai %s "
 "dispoñíbeis. Elixa outra localización."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ficheiro entrante de %s"
@@ -3186,25 +3174,25 @@ msgid "Instant Message (Empathy)"
 msgstr "Mensaxe instantáneo (Empathy)"
 
 # rever
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Non conectarse ao inicio"
 
 # rever
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrar a lista de contactos nin outros diálogos no inicio"
 
 # rever
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " - Cliente de mensaxaría instantánea Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Produciuse un erro ao contactar co Xestor de contas"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3269,239 +3257,85 @@ msgstr ""
 "org>, 2009.\n"
 "Antón Méixome <meixome@mancomun.org>, 2009."
 
-# rever
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Produciuse un erro ao importar as contas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Produciuse un erro ao procesar os detalles da conta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Produciuse un erro ao crear a conta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Produciuse un erro."
-
-# rever
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A mensaxe do erro foi: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
-"deste asistente e engadir as contas máis tarde desde o menú Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Produciuse un erro"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Que clase de conta de chat ten?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ten algunha outra conta de chat que queira estabelecer?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Introduza os seus detalles de conta"
-
-# rever
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Que clase de conta de chat quere crear?"
-
-# rever
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Quere crear outras contas de chat?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Introduza os detalles para a nova conta"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy pode falar en liña con persoas próximas e con amigos e colegas "
-"que usen Google Talk, AIM, Windows Live e calquera outro programa de chat. "
-"Cun micrófono ou unha cámara web tamén pode ter chamadas de audio ou vídeo."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ten algunha outra conta que estea usando con outro programa de chat?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Si, importar os detalles da miña conta desde "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Si, introducirei os meus detalles de conta agora"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Non, quero crear unha conta nova"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Seleccione as contas que quere importar:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Si"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Non, isto é todo por agora"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy pode descubrir automaticamente e conversar con xente conectada na "
-"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
-"detalles de abaixo son correctos. Vostede pode cambiar de forma sinxela eses "
-"detalles máis tarde ou desactivar esta característica usando o diálogo "
-"\"Contas\""
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Editar->Contas"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_Non quero activar esta característica por agora"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Vostede non poderá conversar con xente conectada á súa rede local xa que "
-"telepathy-salut non está instalado.\n"
-"Se quere activar esta característica, instale o paquete telepathy-salut e "
-"cree unha conta de Persoas próximas desde o diálogo Contas"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut non está instalado"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistente de contas de mensaxaría e VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Benvido/a ao Empathy"
-
-# rever
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "_Importar as súas contas existentes"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Insira os detalles persoais"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Hai modificacións sen gardar respecto da súa conta %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "A súa nova conta aínda non foi gardada."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Sen conexión de rede"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Estado descoñecido"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Esta conta desactivouse porque básease nun «backend» non compatíbel. Instale "
+"telepathy-haze e reinicie a sesión para migrar esta conta."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desactivada"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Editar os parámetros da conexión"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Produciuse un fallo ao recuperar a súa información persoal do servidor"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Conéctese para editar a súa información persoal"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Editar os parámetros da conexión…"
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Está seguro de que quere eliminar o grupo '%s' do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Isto non eliminará a súa conta no servidor."
 
 # rever
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3510,16 +3344,24 @@ msgstr ""
 "Está seguro de que quere proceder?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Activar"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Desactivar"
 
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Omitir"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Conectar"
+
 # rever
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3537,8 +3379,8 @@ msgid "_Import…"
 msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Cargando a información da conta"
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:5
@@ -3546,136 +3388,127 @@ msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"Para engadir unha conta nova primeiro ten que instalar unha infraestrutura "
-"para cada protocolo que quere usar."
+"Para engadir unha conta nova primeiro ten que instalar unha «backend» para "
+"cada protocolo que quere usar."
 
 # rever
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Non hai ningún protocolo instalado"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "Cargando a información da conta"
+msgid "No protocol backends installed"
+msgstr "Non hai «backends» de protocolos instalados"
 
 # rever
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticación Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticación Empathy"
 
 # rever
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Persoas próximas"
-
-# rever
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
-msgstr "- Cliente de son/vídeo Empathy"
+msgstr "- Cliente de voz/vídeo Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
-msgstr "Cliente de son/vídeo Empathy"
+msgstr "Cliente de voz/vídeo Empathy"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brillo"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "Barra _lateral"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
-msgstr "Entrada de audio"
+msgstr "Entrada de voz"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
-msgstr "Marcador"
+msgstr "Teclado de chamada"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
-msgstr "Detalles do contacto"
+msgstr "Detalles"
 
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
-msgstr "Chamar con %s"
+msgstr "Chamada con %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "O enderezo IP como é visto polo computador"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O enderezo IP como é visto por un servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O enderezo IP do par como é visto pola outra parte"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "O enderezo IP dun servidor de desvío"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "O enderezo IP do grupo multicast"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../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
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Descoñecido"
 
 # rever
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
 # rever
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Detalles técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3684,8 +3517,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de video admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3694,8 +3527,8 @@ msgstr ""
 "O software de %s non entende algúns dos formatos de vídeo admitidos polo seu "
 "computador"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3704,52 +3537,52 @@ msgstr ""
 "Non é posíbel estabelecer unha conexión a %s. Un deles pode estar nunha rede "
 "que non permite conexións directas."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Produciuse un fallo na rede"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de audio necesarios neste computador"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Non ten instalados os formatos de vídeo necesarios neste computador"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
-"Produciuse un fallo non esperado no compoñente Telepathy. <a "
-"href=«%s»>Informe de este erro</a> e anexe os rexistros que pode ollar na "
-"xanela «Depurar» no menú Axuda."
+"Produciuse un fallo non esperado no compoñente Telepathy. <a href=\"%s"
+"\">Informe de este erro</a> e anexe os rexistros que pode ollar na xanela "
+"«Depuración» no menú Axuda."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Produciuse un fallo ao chamar ao motor"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Chegouse ao final do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Non é posíbel estabelecer un fluxo de audio"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Non é posíbel estabelecer un fluxo de vídeo"
 
@@ -3768,32 +3601,32 @@ msgstr "_Cámara"
 
 #: ../src/empathy-call-window.ui.h:5
 msgid "_Settings"
-msgstr "_Configuracións"
+msgstr "_Preferencias"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Ver"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "A_xuda"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
-msgstr "_Contidos"
+msgstr "_Índice"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
-msgstr "_Depuración"
+msgstr "_Depurar"
 
 #: ../src/empathy-call-window.ui.h:10
 msgid "Swap camera"
-msgstr "Trocar cámara"
+msgstr "Intercambiar cámara"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
@@ -3823,19 +3656,19 @@ msgstr "Videochamada"
 
 #: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
-msgstr "Iniciar vídeochamada"
+msgstr "Iniciar unha videochamada"
 
 #: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
-msgstr "Iniciar chamada de son"
+msgstr "Iniciar unha chamada de voz"
 
 #: ../src/empathy-call-window.ui.h:20
 msgid "Show dialpad"
-msgstr "Mostrar marcador"
+msgstr "Mostrar teclado de chamada"
 
 #: ../src/empathy-call-window.ui.h:21
 msgid "Display the dialpad"
-msgstr "Desactivar o marcador"
+msgstr "Mostrar o teclado de chamada"
 
 # rever
 #: ../src/empathy-call-window.ui.h:22
@@ -3850,7 +3683,7 @@ msgstr "Activar/desactivar transmisión de vídeo"
 #: ../src/empathy-call-window.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:11
 msgid "Send Audio"
-msgstr "Enviar audio"
+msgstr "Enviar voz"
 
 #: ../src/empathy-call-window.ui.h:25
 #: ../src/empathy-streamed-media-window.ui.h:12
@@ -3864,8 +3697,8 @@ msgstr "Códec de codificación:"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -3884,45 +3717,93 @@ msgstr "Candidato remoto:"
 msgid "Local Candidate:"
 msgstr "Candidato local:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "Audio"
-msgstr "Auto"
+msgstr "Son"
+
+# rever
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Pechar esta xanela?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Pechar esta xanela fará que abandone %s. Non recibirá máis mensaxes até que "
+"se una de novo."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Pechar esta xanela fará que abandone unha sala de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+msgstr[1] ""
+"Pechar esta xanela fará que abandone %u salas de chat. Non recibirá máis "
+"mensaxes até que se una de novo."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Pechar %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Non recibirá máis mensaxes deste chat até que se una de novo."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Pechar a xanela"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Abandonar a sala"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
-msgstr[0] "%s (%d non lido)"
-msgstr[1] "%s (%d non lidos)"
+msgstr[0] "%s (%d sen ler)"
+msgstr[1] "%s (%d sen ler)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e outro %u)"
 msgstr[1] "%s (e outros %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] "%s (%d non lido de outros)"
-msgstr[1] "%s (%d non lidos de outros)"
+msgstr[0] "%s (%d sen ler de outros)"
+msgstr[1] "%s (%d sen ler de outros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] "%s (%d non lido de todos)"
-msgstr[1] "%s (%d non lidos de todos)"
+msgstr[0] "%s (%d sen ler de todos)"
+msgstr[1] "%s (%d sen ler de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
 # rever
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3930,7 +3811,7 @@ msgstr[0] "Enviando %d mensaxe."
 msgstr[1] "Enviando %d mensaxes."
 
 # rever
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Escribindo unha mensaxe."
 
@@ -3940,11 +3821,11 @@ msgstr "_Conversa"
 
 #: ../src/empathy-chat-window.ui.h:2
 msgid "C_lear"
-msgstr "_Limpo"
+msgstr "_Limpar"
 
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
-msgstr "Inse_rir unha emoticona"
+msgstr "Inse_rir emoticona"
 
 # rever
 #: ../src/empathy-chat-window.ui.h:4
@@ -3954,16 +3835,16 @@ msgstr "Sala de conversa _favorita"
 # rever
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Notify for All Messages"
-msgstr "Notificar todas as mensaxes"
+msgstr "Notificar para todas as mensaxes"
 
 # rever
 #: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "_Show Contact List"
-msgstr "Mo_strar a lista de contactos"
+msgstr "Mo_strar lista de contactos"
 
 #: ../src/empathy-chat-window.ui.h:7
 msgid "Invite _Participant…"
-msgstr "Invitar _participante…"
+msgstr "Convidar _participante…"
 
 #: ../src/empathy-chat-window.ui.h:8
 msgid "C_ontact"
@@ -3984,19 +3865,19 @@ msgstr "Lapela _seguinte"
 
 #: ../src/empathy-chat-window.ui.h:13
 msgid "_Undo Close Tab"
-msgstr "_Desfacer o peche da lapela"
+msgstr "_Desfacer pechar lapela"
 
 #: ../src/empathy-chat-window.ui.h:14
 msgid "Move Tab _Left"
-msgstr "Mover a lapela á _esquerda"
+msgstr "Mover lapela á _esquerda"
 
 #: ../src/empathy-chat-window.ui.h:15
 msgid "Move Tab _Right"
-msgstr "Mover a lapela á _dereita"
+msgstr "Mover lapela á _dereita"
 
 #: ../src/empathy-chat-window.ui.h:16
 msgid "_Detach Tab"
-msgstr "Des_prender lapela"
+msgstr "_Desacoplar lapela"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -4009,114 +3890,114 @@ msgstr "Sala"
 # rever
 #: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
-msgstr "Conectar automaticamente"
+msgstr "Autoconectar"
 
 # rever
 #: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
-msgstr "Xestionar as salas preferidas"
+msgstr "Xestionar as salas favoritas"
 
 # rever
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Chamada de vídeo entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
 # rever
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s solicítalle unha videochamada. Desexa responderlle?"
+msgstr "%s está chamándoo con vídeo. Desexa responderlle?"
 
 # rever
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr "%s estao chamando. Quérelle responder?"
+msgstr "%s estao chamando. Quere responder?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "Chamada entrante de %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rexeitar"
 
 # rever
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Responder"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Responder con vídeo"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Videochamada entrante de %s"
 
 # rever
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
-msgstr "Convite para unha sala"
+msgstr "Convite a unha sala"
 
 # rever
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
-msgstr "Invitación a unirse a %s"
+msgstr "Convite para unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr "%s estao convidando a unirse a %s"
+msgstr "%s está convidándoo a unirse a %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
-msgstr "_Declinar"
+msgstr "_Rexeitar"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Unirse"
 
 # rever
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s convidouno a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Vostede foi convidado a unirse a %s"
 
 # rever
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Transferencia de ficheiro entrante de %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Requírese o contrasinal"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s solicita permiso para ver cando vostede está dispoñíbel"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -4197,7 +4078,7 @@ msgstr "Produciuse un erro ao enviar un ficheiro"
 #: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr "recibiuse «%s» de %s"
+msgstr "«%s» recibido de %s"
 
 # rever
 #. translators: first %s is filename, second %s
@@ -4205,7 +4086,7 @@ msgstr "recibiuse «%s» de %s"
 #: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
-msgstr "enviado «%s» a %s"
+msgstr "«%s» enviado a %s"
 
 #: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
@@ -4219,12 +4100,12 @@ msgstr "Agardando pola resposta do outro participante"
 #: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
-msgstr "Verificando a integridade de «%s»"
+msgstr "Comprobando a integridade de «%s»"
 
 #: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
-msgstr "Aplicando o hash «%s»"
+msgstr "Obtendo o «hash» de «%s»"
 
 #: ../src/empathy-ft-manager.c:1025
 msgid "%"
@@ -4249,8 +4130,12 @@ msgstr ""
 "Eliminar da lista as transferencias de ficheiros rematadas, canceladas e as "
 "que fallaron"
 
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
 # rever
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4259,83 +4144,101 @@ msgstr ""
 "permite a importación de contas do Pidgin."
 
 # rever
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Orixe"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Escriba o seu contrasinal"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Debe configurar unha conta para ver contactos aquí."
+
 # rever
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Non se atopou ningunha coincidencia."
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 "As contas de %s non se poden usar até que non teña actualizado o seu "
 "software %s."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Actualizar software…"
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar a conta"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recargar %s (%s)…"
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recargar o saldo da conta"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recargar…"
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Debe activar unha das súas contas para ver contactos aquí."
+
+#. 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 "Debe activar %s para ver contactos aquí."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contactos"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configuración da conta"
+
 #: ../src/empathy-roster-window-menubar.ui.h:2
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4358,11 +4261,11 @@ msgstr "Trans_ferencias de ficheiros"
 # rever
 #: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "_Offline Contacts"
-msgstr "Mostrar os contactos _desconectados"
+msgstr "Contactos _desconectados"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
-msgstr "Mostrar os p_rotocolos"
+msgstr "Mostrar p_rotocolos"
 
 #: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Credit Balance"
@@ -4370,67 +4273,63 @@ msgstr "Crédito"
 
 #: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Contacts on a _Map"
-msgstr "Contactos no mapa"
+msgstr "Contactos no _mapa"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Contas"
 
-#: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Personal Information"
-msgstr "Información _persoal"
-
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "Contactos _bloqueados"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referencias"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "Find in Contact _List"
 msgstr "_Buscar na lista de contactos"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por es_tado"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Normal Size With _Avatars"
 msgstr "Tamaño normal con _avatares"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "N_ormal Size"
 msgstr "Tamañ_o normal"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Ta_maño compacto"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "Sa_la"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Unirse…"
 
 # rever
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "Join _Favorites"
-msgstr "Unirse a pre_feridos"
+msgstr "Unirse a _favoritas"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "Manage Favorites"
-msgstr "Xestionar as preferidas"
+msgstr "Xestionar favoritas"
 
 # rever
 #: ../src/empathy-new-chatroom-dialog.c:369
@@ -4452,12 +4351,17 @@ msgid ""
 "Members: %s"
 msgstr ""
 "%s\n"
-"Convite requirido: %s\n"
-"Contrasinal requirido: %s\n"
+"Requírese convite: %s\n"
+"Requírese contrasinal: %s\n"
 "Membros: %s"
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Si"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Non"
 
@@ -4501,7 +4405,7 @@ msgstr "Non foi posíbel ler a lista da sala"
 # rever
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
-msgstr "Lista de _salas"
+msgstr "Lista de salas"
 
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
@@ -4517,7 +4421,7 @@ msgstr "Conversa nova"
 
 # rever
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "O contacto conéctase"
 
 # rever
@@ -4540,47 +4444,47 @@ msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Xulieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr "Oh, Romeo, Romeo!, ¿onde estás que non te vexo?"
+msgstr "Oh, Romeu, Romeu!, ¿onde estás que non te vexo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Nega ao teu pai e rexeita o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou, se non queres, xúrame tan só que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr "Y deixarei eu de ser unha Capuleto."
+msgstr "E deixarei eu de ser un Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Debo escoitar máis ou contestar ao dito?"
 
 # rever
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Xulieta desconectouse"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencias"
 
@@ -4592,91 +4496,98 @@ msgstr "Mostrar as _emoticonas como imaxes"
 # rever
 #: ../src/empathy-preferences.ui.h:2
 msgid "Show contact _list in rooms"
-msgstr "Mostrar a _lista de contactos nas salas"
+msgstr "Mostrar _lista de contactos en salas"
 
 #: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Aparencia"
 
-# rever
 #: ../src/empathy-preferences.ui.h:4
-msgid "_Open new chats in separate windows"
-msgstr "A_brir as conversas novas en xanelas separadas"
+msgid "Start chats in:"
+msgstr "Iniciar conversas en:"
 
 #: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "lapelas no_vas"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "xan_elas novas"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Display incoming events in the notification area"
-msgstr "Mostrar os eventos de entrada na área de notificación"
+msgstr "Mostrar os eventos entrantes na área de notificación"
 
 # rever
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "_Automatically connect on startup"
-msgstr "_Conectar automaticamente ao iniciar"
+msgstr "_Conectar automaticamente ao inicio"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Log conversations"
 msgstr "Rexistrar conversas"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Behavior"
 msgstr "Comportamento"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Xeral"
 
 # rever
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "_Enable bubble notifications"
-msgstr "_Activar as burbullas de notificación"
+msgstr "_Activar notificacións de burbulla"
 
 # rever
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "Disable notifications when _away or busy"
-msgstr "Desactivar as notificacións cando se estea _ausente ou ocupado"
+msgstr "Desactivar notificacións ao estar _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
-msgstr "Activar as notificacións cando a _conversa non está enfocada"
+msgstr "Activar notificacións cando a _conversa non teña o foco"
 
 # rever
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when a contact comes online"
-msgstr "Activar as notificacións cando un contacto está conectado"
+msgstr "Activar notificacións cando un contacto se conecta"
 
 # rever
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable notifications when a contact goes offline"
-msgstr "Activar as notificacións cando un contacto está desconectado"
+msgstr "Activar notificacións cando un contacto se desconecta"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Notificacións"
 
 # rever
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
 msgid "_Enable sound notifications"
-msgstr "_Activar as notificacións de son"
+msgstr "_Activar notificacións de son"
 
 # rever
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
 msgid "Disable sounds when _away or busy"
 msgstr "Desactivar os sons cando se estea _ausente ou ocupado"
 
 # rever
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Reproducir un son para os eventos"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Usar cancelación de _eco para mellorar a calidade da chamada"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 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 "
@@ -4688,48 +4599,48 @@ msgstr ""
 "persoa escoita ruidos estranos ou ten problemas técnicos durante as chamadas "
 "tente desactivando a cancelación do eco e reiniciando a chamada."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Publish location to my contacts"
 msgstr "_Publicar a miña localización aos meus contactos"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../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 ""
-"Unha reducida precisión de localización significa que nada máis preciso que "
-"a súa cidade, rexión e país serán publicados. As coordenadas GPS serán "
+"Unha reducida precisión de localización significa que non se publicará nada "
+"máis preciso que a súa cidade, rexión e país. As coordenadas GPS serán "
 "aproximadas a 1 valor decimal."
 
 #. 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:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Reduce location accuracy"
-msgstr "_Reducir a precisión de localización"
+msgstr "_Reducir a precisión da localización"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
 # rever
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Teléfono móbil"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rede (IP, Wifi)"
+msgstr "_Rede (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid "Location sources:"
 msgstr "Fontes de localización:"
 
 # rever
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4738,24 +4649,24 @@ msgstr ""
 "dicionario instalado."
 
 # rever
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Activar a verificación ortográfica para os idiomas:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Verificación ortográfica"
 
 # rever
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
-msgstr "T_ema da conversa:"
+msgstr "T_ema do chat:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variante:"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temas"
 
@@ -4769,7 +4680,7 @@ msgstr "_Saír"
 
 #: ../src/empathy-streamed-media-window.ui.h:3
 msgid "Redial"
-msgstr "Remarcación"
+msgstr "Remarcar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
 msgid "V_ideo"
@@ -4782,7 +4693,7 @@ msgstr "Vídeo desactivado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
 msgid "Video Preview"
-msgstr "Previsualizar o vídeo"
+msgstr "Previsualizar vídeo"
 
 # rever
 #: ../src/empathy-streamed-media-window.ui.h:7
@@ -4822,115 +4733,132 @@ msgstr "Activar cámara e enviar o vídeo"
 msgid "Contact Map View"
 msgstr "Vista de mapa de contactos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Ligazón a pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Resposta de pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datos demasiado longos para un pegado sinxelo. Garde o rexistro nun ficheiro."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Depurar xanela"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Enviar a pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Depuración"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Información"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mensaxe"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
-msgstr "Tempo"
+msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoría"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivel"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
-"O xestor de conexión seleccionado non é compatíbel coa extensión de "
+"O xestor de conexións seleccionado non é compatíbel coa extensión de "
 "depuración remota."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
-msgstr "Invitar participante"
+msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
-msgstr "Seleccione o contacto que quere invitar á conversa:"
+msgstr "Seleccione un contacto para convidalo á conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
-msgstr "Invitar"
+msgstr "Convidar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "Non mostra ningún diálogo, fai algún traballo (p.ex. importar) e sae"
+msgstr ""
+"Non mostra ningún diálogo, realizar calquera traballo (p.ex. importar) e sair"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
-"Non mostrar ningún diálogo a non ser que só existan contas «Persoas próximas»"
+"Non mostrar ningún diálogo a non ser que só existan contas «Xente cerca»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
-"Conta fornecida seleccionada inicialmente (p.ex. gabble/jabber/"
-"foo_40exemplo_2eorg0)"
+"Conta fornecida inicialmente seleccionada (p.ex. gabble/jabber/exemplo)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
 # rever
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Mostrar o asistente de contas"
-
-# rever
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Contas de Empathy"
 
 # rever
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Contas de Empathy"
 
@@ -4947,87 +4875,87 @@ msgid "Empathy Debugger"
 msgstr "Depurador de Empathy"
 
 # rever
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de conversa Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rexeitar"
 
 # rever
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Responder con vídeo"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
-msgstr "Declinar"
+msgstr "Rexeitar"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Aceptar"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Fornecer"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tentou chamarlle, pero vostede estaba noutra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
-msgstr "i"
+msgstr "Información"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "En espera"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duración"
 
 # rever
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
-msgstr "O seu balance actual é %s."
+msgstr "O seu crédito actual é %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Non ten crédito dabondo para facer esta chamada."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Recargar"
 
@@ -5035,11 +4963,214 @@ msgstr "Recargar"
 msgid "_Match case"
 msgstr "_Coincidir con capitalización"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Que tipo de conta ten?"
+
 # rever
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Engadindo conta nova"
 
+# rever
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Xente cerca"
+
+#: ../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."
+msgstr ""
+"Empathy pode descubrir automaticamente e conversar con xente conectada na "
+"mesma rede que vostede. Se quere usar esta característica, comprobe que os "
+"detalles de abaixo son correctos."
+
+#: ../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 ""
+"Pode cambiar de forma sinxela eses detalles máis tarde ou desactivar esta "
+"característica usando o diálogo <span style=\"italic\">Editar → Contas</"
+"span> na Lista de contactos."
+
+# rever
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Produciuse un erro ao importar as contas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Produciuse un erro ao procesar os detalles da conta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Produciuse un erro ao crear a conta."
+
+#~ msgid "There was an error."
+#~ msgstr "Produciuse un erro."
+
+# rever
+#~ msgid "The error message was: %s"
+#~ msgstr "A mensaxe do erro foi: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Pode ben volver atrás e tentar introducir outra vez os detalles ou saír "
+#~ "deste asistente e engadir as contas máis tarde desde o menú Editar."
+
+#~ msgid "An error occurred"
+#~ msgstr "Produciuse un erro"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Ten algunha outra conta de chat que queira estabelecer?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Introduza os seus detalles de conta"
+
+# rever
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Que clase de conta de chat quere crear?"
+
+# rever
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Quere crear outras contas de chat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Introduza os detalles para a nova conta"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy pode falar en liña con persoas próximas e con amigos e "
+#~ "colegas que usen Google Talk, AIM, Windows Live e calquera outro programa "
+#~ "de chat. Cun micrófono ou unha cámara web tamén pode ter chamadas de "
+#~ "audio ou vídeo."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Ten algunha outra conta que estea usando con outro programa de chat?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Si, importar os detalles da miña conta desde "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Si, introducirei os meus detalles de conta agora"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Non, quero crear unha conta nova"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Non, só quero ver á xente conectada que estea próxima por agora"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Seleccione as contas que quere importar:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Non, isto é todo por agora"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Editar->Contas"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Non quero activar esta característica por agora"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Vostede non poderá conversar con xente conectada á súa rede local xa que "
+#~ "telepathy-salut non está instalado.\n"
+#~ "Se quere activar esta característica, instale o paquete telepathy-salut e "
+#~ "cree unha conta de Persoas próximas desde o diálogo Contas"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut non está instalado"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistente de contas de mensaxaría e VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Benvido/a ao Empathy"
+
+# rever
+#~ msgid "Import your existing accounts"
+#~ msgstr "_Importar as súas contas existentes"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Insira os detalles persoais"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocolo:"
+
+# rever
+#~ msgid "Show account assistant"
+#~ msgstr "Mostrar o asistente de contas"
+
+# rever
+#~ msgid "Linked Contacts"
+#~ msgstr "Contactos ligados"
+
+# rever
+#~ msgid "Select contacts to link"
+#~ msgstr "Seleccione os contactos a ligar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Vista previa do contacto novo"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Ligaranse entre si os contactos seleccionados na lista da esquerda"
+
+# rever
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Ligar contactos…"
+
+# rever
+#~ msgid "Link Contacts"
+#~ msgstr "Ligar contactos"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desligar…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Separar por completo o contacto ligado nos contactos que contén."
+
+#~ msgid "_Link"
+#~ msgstr "_Ligar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desexa desligar os contactos ligados «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Está seguro que quere desligar estes contactos ligados? Isto separará por "
+#~ "completo os contactos ligados en contactos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desligar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Información persoal"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Información _persoal"
+
+# rever
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "A_brir as conversas novas en xanelas separadas"
+
 #~ msgid "Call volume"
 #~ msgstr "Volume da chamada"
 
diff --git a/po/he.po b/po/he.po
index ff11676c6..87af33c62 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-30 10:44+0200\n"
-"PO-Revision-Date: 2011-12-30 10:45+0200\n"
+"POT-Creation-Date: 2012-03-02 14:11+0200\n"
+"PO-Revision-Date: 2012-03-02 14:14+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -33,6 +33,16 @@ msgstr "‏Empathy מסרים מידיים"
 msgid "IM Client"
 msgstr "לקוח מסרים מידיים"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ניהול חשבונות התכתבות ו־VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "חשבונות התכתבות ו־VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Always open a separate chat window for new chats."
@@ -162,286 +172,292 @@ msgid "Hide the main window."
 msgstr "Hide the main window."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Inform other users when you are typing to them"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "Last account selected in Join Room dialog"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "Nick completed character"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "Open new chats in separate windows"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "Path of the Adium theme to use"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "Path of the Adium theme to use if the theme used for chat is Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Play a sound for incoming messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "Play a sound for new conversations"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Play a sound for outgoing messages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "Play a sound when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "Play a sound when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "Play a sound when we log in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "Play a sound when we log out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Pop up notifications if the chat isn't focused"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "Pop up notifications when a contact logs in"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "Pop up notifications when a contact logs out"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "Position the camera preview should be during a call."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "Show Balance in contact list"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "Show avatars"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "Show contact groups"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "Show contact list in rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "Show hint about closing the main window"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "Show offline contacts"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "Show protocols"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "Spell checking languages"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "The default folder to save file transfers in."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "The last directory that an avatar image was chosen from."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "The position for the chat window side pane"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "The stored position (in pixels) of the chat window side pane."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "The theme that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "The theme variant that is used to display the conversation in chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "Use graphical smileys"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "Use notification sounds"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "Use theme for chat rooms"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Whether Empathy can publish the user's location to their contacts."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Whether Empathy can use the GPS to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Whether Empathy can use the cellular network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Whether Empathy can use the network to guess the location."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Whether Empathy should automatically log into your accounts on startup."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Whether Empathy should go into away mode automatically if the user is idle."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Whether Empathy should reduce the location's accuracy for privacy reasons."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Whether Empathy should use the avatar of the contact as the chat window icon."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
 msgstr "Whether connectivity managers should be used to automatically disconnect/reconnect."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "Whether to check words typed against the languages you want to check with."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Whether to convert smileys into graphical images in conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Whether to enable Pulseaudio's echo cancellation filter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "Whether to play a sound to notify of contacts logging into the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "Whether to play a sound to notify of contacts logging out of the network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "Whether to play a sound to notify of events."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Whether to play a sound to notify of incoming messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Whether to play a sound to notify of new conversations."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Whether to play a sound to notify of outgoing messages."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "Whether to play a sound when logging into a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Whether to play a sound when logging out of a network."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Whether to play sound notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Whether to show a popup notification when a contact goes offline."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Whether to show a popup notification when a contact goes online."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 msgstr "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Whether to show a popup notification when receiving a new message."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "Whether to show account balances in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Whether to show avatars for contacts in the contact list and chat windows."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Whether to show contacts that are offline in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "Whether to show groups in the contact list."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Whether to show popup notifications when away or busy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Whether to show protocols for contacts in the contact list."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Whether to show the contact list in chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "Whether to show the contact list in compact mode."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 msgstr "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "Whether to use the theme for chat rooms."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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."
-msgstr "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."
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ניהול חשבונות התכתבות ו־VoIP"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "חשבונות התכתבות ו־VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+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 "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."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -468,7 +484,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "המשתתף האחר לא יכול להעביר את הקובץ"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "סיבה לא ידועה"
 
@@ -489,7 +505,7 @@ msgid "The selected file is empty"
 msgstr "הקובץ הנבחר ריק"
 
 #: ../libempathy/empathy-message.c:415
-#: ../src/empathy-call-observer.c:131
+#: ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "שיחה שלא נענתה מאת %s"
@@ -505,221 +521,225 @@ msgstr "התקשרת ל%s"
 msgid "Call from %s"
 msgstr "שיחה מאת %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "זמין"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "עסוק"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "מרוחק"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "בלתי נראה"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "לא מחובר"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "לא צויינה סיבה"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "המצב מוגדר כמנותק"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "שגיאת רשת"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "האימות נכשל"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "שגיאת הצפנה"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "השם בשימוש"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "לא סופקה תעודה"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "התעודה אינה מאובטחת"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "התעודה לא תקפה"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "התעודה אינה פעילה"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "שם המארח בתעודה לא תואם"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "טביעת האצבע של התעודה אינה תואמת"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "תעודה בחתימה עצמית"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "שגיאת תעודה"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "אין הצפנה זמינה"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "התעודה שגויה"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "החיבור נתקל בסירוב"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "לא ניתן לקיים את החיבור"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "החיבור נקטע"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "המשאב כבר מחובר לשרת"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "חשבון זה כבר מחובר לשרת"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "החיבור הוחלף בחיבור חדש באמצעות אותו המשאב"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "החשבון כבר קיים בשרת"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "השרת עסוק מכדי לטפל בחיבור"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "התעודה נשללה"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "התעודה משתמשת באלגוריתם הצפנה בלתי מאובטח או שהוא חלש מבחינה קריפטוגרפית"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "אורך אישור האבטחה של השרת או עומק מחרוזת אישור האבטחה של השרת חורגים מהמגבלות שהוצבו על ידי ספריית ההצפנה"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "התכנה שלך ישנה מדי"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "שגיאה פנימית"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "אנשים בקרבתי"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "‏Yahoo! יפן"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "צ׳אט Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "לפני שנייה"
 msgstr[1] "לפני %d שניות"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "לפני דקה"
 msgstr[1] "לפני %d דקות"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "לפני שעה"
 msgstr[1] "לפני %d שעות"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "לפני יום"
 msgstr[1] "לפני %d ימים"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "לפני שבוע"
 msgstr[1] "לפני %d שבועות"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "לפני חודש"
 msgstr[1] "לפני %d חודשים"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "בעתיד"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "כל החשבונות"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "חשבון"
 
@@ -737,30 +757,30 @@ msgstr "שרת"
 msgid "Port"
 msgstr "פתחה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "ש_ם משתמש:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "ה_חלה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_כניסה"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "חשבון זה כבר קיים על השרת"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "יצירת חשבון חדש על השרת"
 
@@ -769,19 +789,19 @@ msgstr "יצירת חשבון חדש על השרת"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "‏%1$s על גבי %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "חשבון %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "חשבון חדש"
 
@@ -1229,213 +1249,219 @@ msgstr "כל הקבצים"
 msgid "Click to enlarge"
 msgstr "יש ללחוץ כדי להגדיל"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "התחלת השיחה נכשלה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "איש הקשר המסוים הזה אינו תומך בשיחות"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "איש הקשר המסוים הזה מנותק"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "איש הקשר המסוים הזה אינו תקני"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "אין תמיכה בשיחות חירום בפרוטוקול זה"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "אין לך די אשראי כדי לבצע שיחה זו"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "ארע כשל בפתיחת שיחה פרטית"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "אין תמיכה בשימוש בנושא בדיון זה"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "אין לך הרשאה לשנות את הנושא"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "\"%s\" אינו מזהה איש קשר לא תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: פינוי כל ההודעות מהדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <נושא>:‎ הגדרת נושא השיחה הנוכחית"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <זיהוי החדר>:‎ הצטרפות לחדר שיחה חדש"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<זיהוי החדר>]‎ [<סיבה>]:‎ עזיבת ערוץ השיחה, הנוכחי הוא בררת המחדל"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <זיהוי איש הקשר> ‎[<הודעה>]:‎ פתיחת צ׳אט אישי"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <זיהוי איש הקשר>‎ <הודעה>:‎ פתיחת צ׳אט פרטי"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <כינוי>:‎ שינוי הכינוי שלך בשרת הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <הודעה>:‎ שליחת הודעת ACTION לדיון הנוכחי"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <הודעה>:‎ שליחת <הודעה> לדיון הנוכחי. פקודה זו משמשת לשליחת הודעות המתחילות ב־'/'. לדוגמה: \"/say /join משמשת לצורך התחברות לחדר שיחה חדש\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <מזהה המשתמש>:‎ הצגת פרטים על איש הקשר"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<פקודה>]:‎ הצגת כל הפקודות הנתמכות. אם יש הגדרה ל־<פקודה> יוצג אופן הפעלתה."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "שימוש: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "פקודה לא ידועה"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "פקודה בלתי מוכרת; יש לעיין ב־‎/help לצפייה בפקודות הזמינות"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "המאזן אינו מאפשר לשלוח הודעה"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "שגיאה בשליחת ההודעה '%s': ‏%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "שגיאה בשליחת ההודעה: ‏%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "המאזן אינו מאפשר לשלוח הודעה. <a href='%s'>Top up</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ללא יכולת"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "לא מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "איש קשר לא תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "איש קשר לא תקין"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "הודעה ארוכה מדי"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "לא ממומש"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "נושא:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "הנושא הוגדר ל־: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "הנושא הוגדר על ידי %s בתור: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "לא נקבע נושא"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(אין הצעות)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "הוספת '%s' למילון"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "הוספת '%s' למילון %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "הכנס סמיילי"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_שלח"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "הצעות _איות"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "ארע כשל בקבלת הדוחות האחרונים"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "‏%s התנתק"
@@ -1443,12 +1469,12 @@ msgstr "‏%s התנתק"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "‏%1$s סולק על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "‏%s סולק"
@@ -1456,17 +1482,17 @@ msgstr "‏%s סולק"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "‏%1$s נחסם על ידי %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "‏%s נחסם"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "‏%s עזב את החדר"
@@ -1476,17 +1502,17 @@ msgstr "‏%s עזב את החדר"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "‏%s הצטרף לחדר"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "‏%s נודע כעת בכינוי %s"
@@ -1494,58 +1520,58 @@ msgstr "‏%s נודע כעת בכינוי %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279
+#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "מנותק"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "האם ברצונך לאחסן ססמה זו?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "שמירה"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "לא כעת"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "ניסיון חוזר"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ססמה שגויה; נא לנסות שוב:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "חדר זה מוגן בססמה:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "הצטרפות"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
-#: ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070
+#: ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "שיחה"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1590,7 +1616,7 @@ msgstr "אנשי קשר חסומים"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "הסרה"
@@ -1613,33 +1639,29 @@ msgstr "_פתיחת קישור"
 msgid "%A %B %d %Y"
 msgstr "%A %d ב%B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "מידע אישי"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "איש קשר חדש"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "האם לחסום את %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 "האם אכן ברצונך לחסום את אפשרות ההתקשרות של '%s' אליך?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ח_סימה"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1838,6 +1860,16 @@ msgstr "שמירת תמונה אישית"
 msgid "Unable to save avatar"
 msgstr "לא ניתן לשמור תמונה אישית"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "פרטים אישיים"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "פרטי איש קשר"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "שם מלא"
@@ -1921,11 +1953,6 @@ msgstr "נתוני הלקוח"
 msgid "Client:"
 msgstr "לקוח:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "פרטי איש קשר"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1946,25 +1973,25 @@ msgstr "מערכת הפעלה:"
 msgid "Version:"
 msgstr "גרסה:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "קבוצות"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "יש לבחור את הקבוצות בהן אתה מעוניין שאיש קשר זה יופיע.  ניתן לבחור ביותר מקבוצה אחת או לא לבחור קבוצות בכלל."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "הוס_פת קבוצה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "בחירה"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "קבוצה"
 
@@ -1984,161 +2011,145 @@ msgstr[1] "לא ניתן לחסום את בעלי הזהות הבאים:"
 msgid "Edit Contact Information"
 msgstr "עריכת מידע איש קשר"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "אנשי קשר מקושרים"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "בחירת אנשי קשר לקישור"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "תצוגה מקדימה של איש קשר חדש"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "אנשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "נא לבחור את החשבון לשימוש לצורך ההתקשרות"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "התקשרות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "סלולרי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "עבודה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "בית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "ח_סימת איש קשר"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "_שיחה"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "שיחה _קולית"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "שיחת _וידאו"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "שיחות _קודמות"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "שליחת קובץ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "שיתוף שולחן העבודה שלי"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "מועדף"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "לא הותקנה התכנית gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "נא להתקין את gnome-contacts כדי לכשת לפרטי אנשי הקשר."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_מידע"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_קישור אנשי קשר…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "מזמין/ה אותך לחדר זה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "ה_זמנה לחדר שיחה"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "הוספת _איש קשר…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "מחיקה ו_חסימה"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "האם להסיר את הקבוצה '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "הקבוצה מוסרת"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "ה_סרה"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "להסיר את איש הקשר '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, 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 "האם אכן ברצונך להסיר את איש הקשר המקושר '%s'? נא לשים לב שפעולה זו תסיר את כל אנשי הקשר המתאגדים לאיש קשר מקושר זה."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "איש קשר מוסר"
 
@@ -2157,19 +2168,19 @@ msgstr "<b>מיקום</b> ב(תאריך)"
 msgid "Online from a phone or mobile device"
 msgstr "בחיבור סלולרי או דרך התקן נייד"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "רשת חדשה"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "בחירת רשת IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_איפוס רשימת הרשתות"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "בחירה"
@@ -2182,173 +2193,135 @@ msgstr "שרת חדש"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "קישור בין אנשי קשר"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ה_פרדה…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "פיצול איש הקשר המקושר המוצג לאנשי הקשר אותם הוא מכיל."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_קישור"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "האם לפרק את איש הקשר המקושר '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "האם באמת ברצונך לפרק איש קשר מקושר זה? פעולה זו תפריד את הקשר המקושר הזה לאנשי הקשר אותו הוא מכיל."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_ניתוק"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "היסטוריה"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "הצגה"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "חיפוש"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "שיחה תחת %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "שיחה עם %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %d ב%B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "* %s %s"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "שנייה אחת"
 msgstr[1] "%s שניות"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "דקה אחת"
 msgstr[1] "%s דקות"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "השיחה ארכה %s, הסתיימה ב־%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "היום"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "אתמול"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "ה־%e ב%B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "כל זמן שהוא"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "כל אחד"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "מי"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "מתי"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "כל דבר"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "מלל הצ׳אטים"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "שיחות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "שיחות נכנסות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "שיחות יוצאות"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "שיחות שלא נענו"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "מה"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "האם אכן ברצונך למחוק את כל היומנים של הדיונים האחרונים שלך?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "מחיקת הכול"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "מחיקה עד מ־:"
 
@@ -2378,7 +2351,7 @@ msgstr "וידאו"
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "ע_ריכה"
 
@@ -2435,7 +2408,7 @@ msgid "There was an error starting the conversation"
 msgstr "אירעה שגיאה בעת התחלת הדיון"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "יש להזין מזהה לאיש הקשר או מספר טלפון:"
 
@@ -2445,17 +2418,17 @@ msgid "New Conversation"
 msgstr "שיחה חדשה"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "שיֹחת _וידאו"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "ֹשיחה _קולית"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "שיחה חדשה"
 
@@ -2511,7 +2484,7 @@ msgstr "הודעות מותאמות אישית…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "חשבון %s חדש"
@@ -2580,12 +2553,12 @@ msgstr "שיחה קולית הסתיימה"
 msgid "Edit Custom Messages"
 msgstr "עריכת הודעה מותאמת"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "ההודעה נערכה ב־%s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "רגיל"
 
@@ -2660,39 +2633,43 @@ msgid "Certificate hostname: %s"
 msgstr "מארח אישור האבטחה: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "המשך"
+msgid "C_ontinue"
+msgstr "המ_שך"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "חיבור מפוקפק"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "חיבור זה אינו מהימן. האם ברצונך להמשיך בכל מקרה?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "יש לזכור בחירה זו עבור חיבורים עתידיים"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "פרטי התעודה"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "לא ניתן לפתוח את הכתובת"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "בחירת קובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "אין די מקום פנוי לשמירת הקובץ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "נדרשים %s של מקום פנוי כדי לשמור קובץ זה, אך ישנם רק %s פנויים. נא לבחור במיקום אחר."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "קובץ נכנס מ־%s"
@@ -2872,23 +2849,23 @@ msgstr "אין הודעת שגיאה"
 msgid "Instant Message (Empathy)"
 msgstr "הודעה מיידית (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "לא להתחבר בהפעלה"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "אין להציג את רשימת אנשי הקשר או כל דו־שיח אחר בהפעלה"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- לקוח המסרים המידיים Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "שגיאה ביצירת קשר עם מנהל החשבונות"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2924,203 +2901,77 @@ msgstr ""
 "פרוייקט תרגום GNOME לעברית:\n"
 "‏http://gnome-il.berlios.de"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "ארעה שגיאה בזמן יבוא החשבונות."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "ארעה שגיאה בעת ניתוח נתוני החשבון."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "ארעה שגיאה במהלך יצירת החשבון."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "ארעה שגיאה."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "הודעת השגיאה הייתה: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "ניתן לחזור אחורה ולנסות להקליד את פרטי החשבון שוב או לצאת ממסייע זה ולהוסיף חשבונות מאוחר יותר מתפריט העריכה."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "התרחשה שגיאה."
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "אילו חשבונות יש לך?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "האם יש לך חשבונות נוספים שברצונך להגדיר?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "נא להזין את פרטי החשבון שלך"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "איזה חשבון שיחות ברצונך ליצור?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "האם ברצונך ליצור חשבונות שיחה אחרים?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "נא להזין את הפרטים עבור החשבון החדש"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "בעזרת Empathy ניתן לשוחח עם אנשים קרובים המחוברים לרשת ועם חברים ועמיתים לעבודה המשתמשים ב־Google Talk, ‏AIM,‏ Windows Live ועוד תוכנות דומות רבות. בעזרת המיקרופון ומצלמת הרשת שלך ניתן גם לנהל שיחות קול ווידאו."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "יש לך חשבון שהשתמשת בו עם תוכנת שיחה אחרת?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "כן, נא לייבא את פרטי החשבון מ־"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "כן, אני אזין את פרטי החשבון עכשיו"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "לא, אני רוצה חשבון חדש"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "לא, אני רק רוצה לראות אנשים המחוברים בקרבת מקום לעת עתה"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "נא לבחור את החשבון שברצונך לייבא:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "כן"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "לא, זה הכול לעכשיו"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "באפשרות Empathy לגלות ולנהל שיחות עם אנשים המחוברים לאותה הרשת כמוך. אם ברצונך להשתמש בתכונה זו, נא לבדוק שהפרטים שלהלן נכונים. ניתן לשנות פרטים אלה בקלות מאוחר יותר או לבטל תכונה זו באמצעות הדו־שיח 'חשבונות'"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "עריכה->חשבונות"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "אין לי _כל עניין לאפשר את התכונה הזו כעת"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "לא ניתן יהיה לשוחח עם אנשים המחוברים לרשת המקומית שלך כיוון ש־telepathy-salut אינה מותקנת, אם ברצונך להפעיל תכונה זו עליך להתקין את החבילה telepathy-salut וליצור חשבון ב'אנשים בקרבתי' מדו־שיח החשבונות"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut אינה מותקנת"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "ברוך בואך אל Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "ייבוא חשבונות קיימים"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "נא להזין פרטים אישיים"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ישנם שינויים שלא נשמרו בחשבון ה־%s שלך."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "החשבון החדש שלך לא נשמר עדיין."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "בהתחברות…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "לא מחובר — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "מנותק  — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "מנותק — אין חיבור לרשת"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "מצב לא ידוע"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "חשבון זה נוטרל כיוון שהוא נשען על מנגנון ישן שאינו נתמך עוד. נא להתקין את telepathy-haze ולצאת ולהיכנס לחשבון המשתמש שלך כדי לייבא את החשבון."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "מנותק — החשבון מנוטרל"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "עריכת הגדרות החיבור"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "אירע כשל בקבלת הפרטים האישיים שלך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "עליך להתחבר כדי לערוך את הפרטים האישיים שלך."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "ע_ריכת הגדרות החיבור..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "האם ברצונך להסיר את החשבון '%s' ממחשבך?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "פעולה זו לא תסיר את חשבונך מהשרת."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3129,15 +2980,23 @@ msgstr ""
 "את השינויים שלך. האת אתה בטוח שברצונך להמשיך?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "ה_פעלה"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "נ_טרול"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_דילוג"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "הת_חברות"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3154,18 +3013,14 @@ msgid "Loading account information"
 msgstr "פרטי איש הקשר נטענים"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "אין פרוטוקולים מותקנים"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "פרוטוקול:"
+msgid "No protocol backends installed"
+msgstr "אין מנגנוני פרוטוקולים מותקנים"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "על מנת להוסיף חשבון חדש עליך להתקין מנוע לכל פרוטוקול שבו ברצונך להשתמש."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "י_בוא…"
 
@@ -3177,17 +3032,13 @@ msgstr "- לקוח האימות של Empathy"
 msgid "Empathy authentication client"
 msgstr "לקוח האימות של Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "אנשים בקרבתי"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- לקוח השמע/הווידאו Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "לקוח השמע/הווידאו Empathy"
 
@@ -3230,111 +3081,111 @@ msgstr "פרטים"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "שיחה עם %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "כתובת ה־IP כפי שנראית על ידי המחשב"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "כתובת ה־IP כפי שנראית על ידי שרת באינטרנט"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "כתובת ה־IP כדי שנראית על ידי עמית מהצד השני"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "כתובת ה־IP של שרת הממסר"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "כתובת ה־IP של קבוצת התשדורת"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "ֹלא ידוע"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "מחובר — %d:%02d דק׳"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "פרטים טכניים"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "התכנה של %s אינה מבינה את מבני השמע הנתמכים על ידי המחשב שלך"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "התכנה של %s אינה מבינה את מבני הווידאו הנתמכים על ידי המחשב שלך"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "לא ניתן להפעיל את החיבור אל %s. כנראה אחד ממשתתפי השיחה מחובר לרשת שאינה מאפשרת חיבורים ישירים."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "אירעה שגיאה ברשת"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "מבני השמע הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "מבני הווידאו הדרושים לקיום שיחה זו אינם מותקנים במחשבך"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "משהו בלתי צפוי ארע ברכיב של Telepathy. נא <a href=\"%s\">לדווח על באג זה</a> ולהוסיף דוחות שנאספו מחלון 'ניפוי השגיאות' שבתפריט העזרה."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "אירעה שגיאה במנוע הקריאה"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "התזרים הגיע לסיומו"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "לא ניתן לקיים תזרים שמע"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "לא ניתן לקיים תזרים וידאו"
 
@@ -3426,10 +3277,10 @@ msgstr "החלפת מצב העברת וידאו"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "לא ידוע"
 
@@ -3448,18 +3299,18 @@ msgstr "מ_צלמה"
 
 #: ../src/empathy-call-window.ui.h:26
 #: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_תכנים"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_ניפוי שגיאות"
 
 #: ../src/empathy-call-window.ui.h:29
 #: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "ע_זרה"
 
@@ -3472,52 +3323,85 @@ msgid "_Settings"
 msgstr "ה_גדרות"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_תצוגה"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "האם לסגור חלון זה?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "סגירת חלון זה תגרום לעזיבת %s. לא יתקבלו עוד הודעות על להצטרפותך אליו מחדש."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "סגירת חלון זה תוביל לעזיבת חדר הצ׳אט. לא יתקבלו עוד הודעות עד להתחברותך מחדש אליו."
+msgstr[1] "סגירת חלון זה תוביל לעזיבת %u חדרי הצ׳אט. לא יתקבלו עוד הודעות עד להתחברותך מחדש אליהם."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "האם לעזוב את %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "לא יתקבלו עוד הודעות מחדר צ׳אט זה עד להצטרפותך המחודשת אליו."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "סגירת החלון"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "עזיבת החדר"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "‏%s (אחת שלא נקראה)"
 msgstr[1] "‏%s ‏(%d שלא נקראו)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "‏%s (ואחד נוסף)"
 msgstr[1] "‏%s (ו־%u נוספים)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "‏%s (אחת שלא נקראה מאחרים)"
 msgstr[1] "‏%s (%d שלא נקראו מאחרים)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "‏%s (אחת שלא נקראה מכולם)"
 msgstr[1] "‏%s (%d שלא נקראו מכולם)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "נשלחת הודעה אחת"
 msgstr[1] "נשלחות %d הודעות"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "הודעה מוקלדת."
 
@@ -3598,102 +3482,102 @@ msgstr "חיבור אוטומטי"
 msgid "Manage Favorite Rooms"
 msgstr "ניהול חדרי שיחה מועדפים"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "שיחה קולית נכנסת"
 
-#: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "שיחה נכנסת"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "‏%s מתקשר אליך עם וידאו, האם ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "‏%s מתקשר אליך, האם ברצונך לענות?"
 
-#: ../src/empathy-event-manager.c:531
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "שיחה נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_דחייה"
 
-#: ../src/empathy-event-manager.c:564
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_מענה"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "מ_ענה עם וידאו"
 
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "שיחת וידאו נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "הזמנה לחדר"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "הזמנה להצטרף ל־%s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "‏%s מזמין/ה אותך להצטרף אל %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_סירוב"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "ה_צטרפות"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "‏%s הזמין/ה אותך להצטרף אל %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "הוזמנת להצטרף אל %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "העברת קבצים נכנסת מ־%s"
 
-#: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "נדרשת ססמה"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s רוצה הרשאות לצפייה מתי המשתמש שלך מחובר"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3816,172 +3700,190 @@ msgstr "העברות קבצים"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "הסרת העברות קבצים שהושלמו, בוטלו או נכשלו מהרשימה"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "י_בוא"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "לא נמצאו חשבונות לייבוא. Empathy תומך כרגע בייבוא חשבונות מ־Pidgin בלבד."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "יבוא חשבונות"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "יבוא"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "פרוטוקול"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "מקור"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "הזנת ססמה"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ניתוק"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "עליך להגדיר חשבון כדי שיופיעו כאן אנשי קשר."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "לא נמצאה התאמה"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "לא ניתן להשתמש בחשבונות %s עד שהתכנה %s תעודכן, עמך הסליחה."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "עדכון התכנה..."
 
-#: ../src/empathy-main-window.c:817
-#: ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "סגירה"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "התחברות מחדש"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "עריכת חשבון"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Top up %s (%s)..."
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "אשראי חשבון ה־Top up"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Top Up..."
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "איש קשר"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "עליך להפעיל את אחד החשבונות שלך כדי שיופיעו כאן אנשי קשר."
+
+#. 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 "עליך להפעיל את %s כדי שיופיעו כאן אנשי קשר."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "רשימת אנשי קשר"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "הגדרות החשבון"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "אנשי קשר על ה_מפה"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "מאזן האשראי"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "_חיפוש ברשימת אנשי הקשר"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "_צירוף למועדפים"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ניהול מועדפים"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "גודל _רגיל"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
+#: ../src/empathy-roster-window-menubar.ui.h:7
 #: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_שיחה חדשה…"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "גודל רגיל עם _תמונות אישיות"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "העד_פות"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "הצגת פ_רוטוקולים"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "מיון לפי _שם"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "מיון לפי _מצב"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_חשבונות"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "אנשי קשר _חסומים"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "גודל _קומפקטי"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "העברות _קבצים"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "ה_צטרפות…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_שיחה חדשה…"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "אנשי קשר _לא מחוברים"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "מידע _אישי"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "_חדר"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_חיפוש אחר אנשי קשר…"
 
@@ -3995,7 +3897,7 @@ msgstr "חברים"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4008,16 +3910,21 @@ msgstr ""
 "נדרשת ססמה: %s\n"
 "חברים: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "כן"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "לא"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "לא ניתן להתחיל את הצגת החדרים"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "לא ניתן לעצור את הצגת החדרים"
 
@@ -4058,8 +3965,8 @@ msgid "New conversation"
 msgstr "שיחה חדשה"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
-msgstr "איש קשר מתחבר"
+msgid "Contact comes online"
+msgstr "איש הקשר מתחבר"
 
 #: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
@@ -4078,46 +3985,46 @@ msgid "Language"
 msgstr "שפה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "יוליה"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "רומיאו"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "הו רומיאו, רומיאו, מן אין שבת רומיאו?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "התכחש לאביך וסרב לשמו;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "או אם לא תסכים, אשבע לך באהבתי"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "ולא אהיה עוד בת קפולט."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "האם דיברתי די או שמא אוסיף לדבר?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "יוליה התנתקה"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "העדפות"
 
@@ -4210,49 +4117,49 @@ msgid "Spell Checking"
 msgstr "בדיקת איות"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "הפעלת צ׳אטים ב־:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "The list of languages reflects only the languages for which you have a dictionary installed."
 msgstr "ברשימת השפות מוצגות שפות שעבורן מותקנים אצלך מילונים."
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "שימוש ב_ביטול הד כדי לשפר את איכות השיחה"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "הגוון:"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "התחברות _אוטומטית עם ההפעלה"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "טלפון _סלולרי"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "ה_פעלת התרעות בתוך בועה"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "ה_פעלת התרעות קוליות"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_רשת (IP, אלחוטית)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_פתיחת שיחות חדשות בחלונות נפרדים"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_פרסום המיקום שלי לאנשי הקשר שלי"
@@ -4262,6 +4169,14 @@ msgstr "_פרסום המיקום שלי לאנשי הקשר שלי"
 msgid "_Reduce location accuracy"
 msgstr "ה_פחתת דיוק המיקום"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "_חלונות חדשים"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_לשוניות חדשות"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "מצב"
@@ -4322,64 +4237,85 @@ msgstr "תצוגה מקדימה לווידאו"
 msgid "Contact Map View"
 msgstr "מפת אנשי קשר"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "שמירה"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "קישור ל־Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "תגובה מ־Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "הנתונים גדולים מדי להדבקה אחת. נא לשמור את היומנים לקובץ."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "חלון ניפוי שגיאות"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "שליחה ל־Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "השהייה"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "מידע"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "הודעה"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "קריטי"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "שגיאה"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "זמן"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "תחום"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "קטגוריה"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "רמה"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "מנהל החיבורים שנבחר אינו תומך בהרחבת ניפוי שגיאות מרחוק."
 
@@ -4396,31 +4332,27 @@ msgstr "נא לבחור אנשי קשר להזמנה לדיון:"
 msgid "Invite"
 msgstr "הזמנה"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "אין להציג דו־שיח כלשהו; תתבצע פעולה כלשהי (לדוגמה יבוא) ולאחריה התכנית תסגר"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "אין להציג תיבות דו־שיח כלשהן אלא אם כן ישנן חשבונות \"אנשים בקרבתי\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "בחירת החשבון הנתון כבר בהתחלה (לדוגמה gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "הצגת מסייע החשבונות"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- חשבונות Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "חשבונות Empathy"
 
@@ -4436,86 +4368,86 @@ msgstr "- מנפה השגיאות של Empathy"
 msgid "Empathy Debugger"
 msgstr "מנפה השגיאות של Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- לקוח הצ׳אטים Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "תגובה"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "דחייה"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "מענה"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "מענה עם וידאו"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "סירוב"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "אישור"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "הזנה"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "התקבלה בקשת שיחה מאת %s, אך באותו הזמן כבר היית בשיחה אחרת."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "בהמתנה"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "השתק"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "משך"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d דק׳"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "המאזן הנוכחי שלך הוא %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "אין לך מספיק אשראי כדי לבצע שיחה זו."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Top Up"
 
@@ -4523,10 +4455,184 @@ msgstr "Top Up"
 msgid "_Match case"
 msgstr "התאמת _רישיות"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "אילו חשבונות יש לך?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "נוסף חשבון חדש"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "אנשים בקרבתי"
+
+#: ../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."
+msgstr "באפשרות Empathy לגלות ולנהל שיחות עם אנשים המחוברים לאותה הרשת כמוך. אם ברצונך להשתמש בתכונה זו, נא לבדוק שהפרטים שלהלן נכונים."
+
+#: ../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 "באפשרותך לשנות פרטים אלה מאוחר יותר או לנטרל תכונה זו על ידי בחירה ב<span style=\"italic\">עריכה ← חשבונות</span> ברשימת אנשי הקשר."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "אנשי קשר מקושרים"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "בחירת אנשי קשר לקישור"
+
+#~ msgid "New contact preview"
+#~ msgstr "תצוגה מקדימה של איש קשר חדש"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "אנשי הקשר שנבחרו ברשימה שמימין יקושרו זה לזה."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_קישור אנשי קשר…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "קישור בין אנשי קשר"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "ה_פרדה…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "פיצול איש הקשר המקושר המוצג לאנשי הקשר אותם הוא מכיל."
+
+#~ msgid "_Link"
+#~ msgstr "_קישור"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "האם לפרק את איש הקשר המקושר '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "האם באמת ברצונך לפרק איש קשר מקושר זה? פעולה זו תפריד את הקשר המקושר הזה "
+#~ "לאנשי הקשר אותו הוא מכיל."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_ניתוק"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "ארעה שגיאה בזמן יבוא החשבונות."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "ארעה שגיאה בעת ניתוח נתוני החשבון."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "ארעה שגיאה במהלך יצירת החשבון."
+
+#~ msgid "There was an error."
+#~ msgstr "ארעה שגיאה."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "הודעת השגיאה הייתה: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "ניתן לחזור אחורה ולנסות להקליד את פרטי החשבון שוב או לצאת ממסייע זה "
+#~ "ולהוסיף חשבונות מאוחר יותר מתפריט העריכה."
+
+#~ msgid "An error occurred"
+#~ msgstr "התרחשה שגיאה."
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "האם יש לך חשבונות נוספים שברצונך להגדיר?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "נא להזין את פרטי החשבון שלך"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "איזה חשבון שיחות ברצונך ליצור?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "האם ברצונך ליצור חשבונות שיחה אחרים?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "נא להזין את הפרטים עבור החשבון החדש"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "בעזרת Empathy ניתן לשוחח עם אנשים קרובים המחוברים לרשת ועם חברים ועמיתים "
+#~ "לעבודה המשתמשים ב־Google Talk, ‏AIM,‏ Windows Live ועוד תוכנות דומות רבות. "
+#~ "בעזרת המיקרופון ומצלמת הרשת שלך ניתן גם לנהל שיחות קול ווידאו."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "יש לך חשבון שהשתמשת בו עם תוכנת שיחה אחרת?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "כן, נא לייבא את פרטי החשבון מ־"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "כן, אני אזין את פרטי החשבון עכשיו"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "לא, אני רוצה חשבון חדש"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "לא, אני רק רוצה לראות אנשים המחוברים בקרבת מקום לעת עתה"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "נא לבחור את החשבון שברצונך לייבא:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "לא, זה הכול לעכשיו"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "עריכה->חשבונות"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "אין לי _כל עניין לאפשר את התכונה הזו כעת"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "לא ניתן יהיה לשוחח עם אנשים המחוברים לרשת המקומית שלך כיוון ש־telepathy-"
+#~ "salut אינה מותקנת, אם ברצונך להפעיל תכונה זו עליך להתקין את החבילה "
+#~ "telepathy-salut וליצור חשבון ב'אנשים בקרבתי' מדו־שיח החשבונות"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "מסייע חשבונות ההתכתבות וה־VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "ברוך בואך אל Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ייבוא חשבונות קיימים"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "נא להזין פרטים אישיים"
+
+#~ msgid "Protocol:"
+#~ msgstr "פרוטוקול:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "הצגת מסייע החשבונות"
+
+#~ msgid "Personal Information"
+#~ msgstr "מידע אישי"
+
+#~ msgid "_Personal Information"
+#~ msgstr "מידע _אישי"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_פתיחת שיחות חדשות בחלונות נפרדים"
+
 #~ msgid "My Web Accounts"
 #~ msgstr "החשבונות המקוונים שלי"
 
@@ -5025,9 +5131,6 @@ msgstr "נוסף חשבון חדש"
 #~ msgid "Unknown error code"
 #~ msgstr "מספר שגיאה לא ידוע"
 
-#~ msgid "msn account settings"
-#~ msgstr "הגדרות חשבון msn"
-
 #~ msgid "salut account settings"
 #~ msgstr "הגדרות חשבון salut"
 
diff --git a/po/hu.po b/po/hu.po
index b9e36f165..8fc11c8db 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,502 +7,566 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 20:14+0200\n"
-"PO-Revision-Date: 2012-01-09 12:41+0100\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-02 10:35+0000\n"
+"PO-Revision-Date: 2012-03-07 10:18+0100\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
-"Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
-"Language: \n"
+"Language-Team: Magyar <gnome-hu-list at gnome dot org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: \n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Csevegés Google Talk, Facebook, MSN és sok más szolgáltatáson"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Üzenetküldő-kliens"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy üzenetküldő"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Üzenetküldő-kliens"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Csevegés Google Talk, Facebook, MSN és sok más szolgáltatáson"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Üzenetküldő- és VoIP-fiókok"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Üzenetküldő- és VoIP-fiókok kezelése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Mindig külön ablakot nyisson az új csevegéseknek."
+msgid "Connection managers should be used"
+msgstr "Használandó kapcsolatkezelők"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Hívás hangereje"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Hívás hangereje százalékban."
+msgid "Empathy should auto-connect on startup"
+msgstr "Az Empathy automatikusan csatlakozzon-e induláskor?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kameraeszköz"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Az Empathy automatikusan bejelentkezzen-e a fiókjaiba induláskor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kamerapozíció"
+msgid "Empathy should auto-away when idle"
+msgstr "Az Empathy automatikusan távol módba váltson-e üresjáratban?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Becenévhez fűzendő karakter becenév-kiegészítés (tab) használatakor "
-"csoportos csevegésben."
+"Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Csevegőablak témája"
+msgid "Empathy default download folder"
+msgstr "Az Empathy alapértelmezett letöltési mappája"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Csevegőablak témájának változata"
+msgid "The default folder to save file transfers in."
+msgstr "Alapértelmezett mappa átvitt fájlok mentéséhez."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"A helyesírás-ellenőrző által használandó nyelvek vesszővel elválasztott "
-"listája (például: „en, fr, hu”)."
+msgid "Show offline contacts"
+msgstr "Kilépett partnerek megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Tömör partnerlista"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Kilépett partnerek megjelenítése a partnerlistában."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Használandó kapcsolatkezelők"
+msgid "Show avatars"
+msgstr "Avatarok megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Partnerlista rendezési feltétele"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
+"csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"A videohívásokban használandó alapértelmezett kameraeszköz, például /dev/"
-"video0."
+msgid "Show protocols"
+msgstr "Protokollok megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Alapértelmezett könyvtár avatar kép kiválasztásához"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
+"csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Felugró értesítések tiltása ha nincs itt"
+msgid "Show Balance in contact list"
+msgstr "Egyenleg megjelenítése a partnerlistában"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Hangok tiltása ha nincs itt"
+msgid "Whether to show account balances in the contact list."
+msgstr "Megjelenjenek-e a fiókegyenlegek a partnerlistában."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Bejövő események megjelenítése az állapotterületen"
+msgid "Compact contact list"
+msgstr "Tömör partnerlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Bejövő események megjelenítése az állapotterületen. Ha hamis, akkor azonnal "
-"megjeleníti ezeket a felhasználónak."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Megjelenjen-e a partnerlista tömör módban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Visszhang-csillapítás támogatása"
+msgid "Hide main window"
+msgstr "Főablak elrejtése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Az Empathy közzéteheti a felhasználó helyét"
+msgid "Hide the main window."
+msgstr "A főablak elrejtése."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Az Empathy használhatja a GPS-t a hely meghatározására"
+msgid "Default directory to select an avatar image from"
+msgstr "Alapértelmezett könyvtár avatar kép kiválasztásához"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Az Empathy használhatja mobilhálózatot a hely meghatározására"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Az utolsó könyvtár, amelyből egy avatar kép kiválasztásra került."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Az Empathy használhatja a hálózatot a hely meghatározására"
+msgid "Open new chats in separate windows"
+msgstr "Új csevegések megnyitása külön ablakokban"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Az Empathy alapértelmezett letöltési mappája"
+msgid "Always open a separate chat window for new chats."
+msgstr "Mindig külön ablakot nyisson az új csevegéseknek."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Az Empathy átköltöztette az MSN-naplókat"
+msgid "Display incoming events in the status area"
+msgstr "Bejövő események megjelenítése az állapotterületen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Az Empathy automatikusan távol módba váltson-e üresjáratban?"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Bejövő események megjelenítése az állapotterületen. Ha hamis, akkor azonnal "
+"megjeleníti ezeket a felhasználónak."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Az Empathy automatikusan csatlakozzon-e induláskor?"
+msgid "The position for the chat window side pane"
+msgstr "A csevegőablak oldalsávjának pozíciója"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Az Empathy csökkentse-e a hely pontosságát?"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "A csevegőablak oldalsávjának tárolt pozíciója képpontban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "Partnercsoportok megjelenítése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit fejlesztőeszközök engedélyezése"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "Megjelenjenek-e a csoportok a partnerlistában."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Felugró értesítések engedélyezése új üzenetekre"
+msgid "Contact list sort criterion"
+msgstr "Partnerlista rendezési feltétele"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Helyesírás-ellenőrző engedélyezése"
+#| 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 ""
+"A partnerlista rendezéséhez használandó feltétel A lehetséges értékek: "
+"„name” (név szerint) és „state” (állapot szerint, ez az alapértelmezett)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Főablak elrejtése"
+msgid "Use notification sounds"
+msgstr "Értesítő hangok használata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "A főablak elrejtése."
+msgid "Whether to play a sound to notify of events."
+msgstr "Lejátsszon-e hangot az eseményekre figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Kiegészített becenevet jelző karakter"
+msgid "Disable sounds when away"
+msgstr "Hangok tiltása ha nincs itt"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Új csevegések megnyitása külön ablakokban"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Lejátsszon-e hangos értesítéseket, ha Ön távol van vagy elfoglalt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "A használandó Adium téma útvonala"
+msgid "Play a sound for incoming messages"
+msgstr "Hang lejátszása érkező üzenetekhez"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Lejátsszon-e hangot bejövő üzenetekre figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "Hang lejátszása érkező üzenetekhez"
+msgid "Play a sound for outgoing messages"
+msgstr "Hang lejátszása kimenő üzenetekhez"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Hang lejátszása új társalgásokhoz"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Lejátsszon-e hangot kimenő üzenetekre figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "Hang lejátszása kimenő üzenetekhez"
+msgid "Play a sound for new conversations"
+msgstr "Hang lejátszása új társalgásokhoz"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Hang lejátszása partner bejelentkezésekor"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Lejátsszon-e hangot új társalgásokra figyelmeztetésként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Hang lejátszása partner kijelentkezésekor"
+msgid "Play a sound when a contact logs in"
+msgstr "Hang lejátszása partner bejelentkezésekor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Hang lejátszása bejelentkezéskor"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Hang lejátszása kijelentkezéskor"
+msgid "Play a sound when a contact logs out"
+msgstr "Hang lejátszása partner kijelentkezésekor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Felugró értesítések megjelenítése, ha a csevegés nincs fókuszban"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a "
+"hálózatból?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Felugró értesítések megjelenítése, ha egy partner bejelentkezik"
+msgid "Play a sound when we log in"
+msgstr "Hang lejátszása bejelentkezéskor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Felugró értesítések megjelenítése, ha egy partner kijelentkezik"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Lejátsszon-e hangot a hálózatba bejelentkezéskor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "A kamera-előnézet helye a hívás során."
+msgid "Play a sound when we log out"
+msgstr "Hang lejátszása kijelentkezéskor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Egyenleg megjelenítése a partnerlistában"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Lejátsszon-e hangot a hálózatból kijelentkezéskor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Avatarok megjelenítése"
+msgid "Enable popup notifications for new messages"
+msgstr "Felugró értesítések engedélyezése új üzenetekre"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Partnerlista megjelenítése szobákban"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Megjelenjenek-e felugró értesítések új üzenet érkezésekor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Tanács megjelenítése a főablak bezárásakor"
+msgid "Disable popup notifications when away"
+msgstr "Felugró értesítések tiltása ha nincs itt"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Kilépett partnerek megjelenítése"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Megjelenjenek-e felugró értesítések, ha Ön távol van vagy elfoglalt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Protokollok megjelenítése"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Felugró értesítések megjelenítése, ha a csevegés nincs fókuszban"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Helyesírás-ellenőrző nyelvei"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Megjelenjenek-e felugró értesítések új üzenet érkezésekor akkor is, ha a "
+"csevegés meg van nyitva, de nincs fókuszban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Alapértelmezett mappa átvitt fájlok mentéséhez."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Felugró értesítések megjelenítése, ha egy partner bejelentkezik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Az utolsó könyvtár, amelyből egy avatar kép kiválasztásra került."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Megjelenjenek-e felugró értesítések, ha egy partner elérhető állapotúvá "
+"válik."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "A csevegőablak oldalsávjának pozíciója"
+msgid "Pop up notifications when a contact logs out"
+msgstr "Felugró értesítések megjelenítése, ha egy partner kijelentkezik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "A csevegőablak oldalsávjának tárolt pozíciója képpontban."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "A társalgás megjelenítésére használt téma a csevegőablakokban."
+msgid "Use graphical smileys"
+msgstr "Grafikus hangulatjelek használata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "A társalgás megjelenítésére használt témaváltozat a csevegőablakokban."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Hangulatjelek képekké alakítása társalgások közben."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "Grafikus hangulatjelek használata"
+msgid "Show contact list in rooms"
+msgstr "Partnerlista megjelenítése szobákban"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Értesítő hangok használata"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Megjelenjen-e a partnerlista csevegőszobákban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Téma használata a csevegőszobákhoz"
+msgid "Chat window theme"
+msgstr "Csevegőablak témája"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Az Empathy közzéteheti-e a felhasználó helyét a partnereinek."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "A társalgás megjelenítésére használt téma a csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Az Empathy használhatja-e a GPS-t a hely meghatározására."
+msgid "Chat window theme variant"
+msgstr "Csevegőablak témájának változata"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Az Empathy használhatja-e a mobilhálózatot a hely meghatározására."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "A társalgás megjelenítésére használt témaváltozat a csevegőablakokban."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Az Empathy használhatja-e a hálózatot a hely meghatározására."
+msgid "Path of the Adium theme to use"
+msgstr "A használandó Adium téma útvonala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Az Empathy átköltöztette-e az MSN naplókat."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"A használandó Adium téma útvonala, ha a csevegéshez használ téma Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Az Empathy automatikusan bejelentkezzen-e a fiókjaiba induláskor."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit fejlesztőeszközök engedélyezése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Az Empathy automatikusan távol módba váltson-e, ha a felhasználó tétlen."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Az Empathy csökkentse-e adatvédelmi okokból a hely pontosságát."
+msgid "Inform other users when you are typing to them"
+msgstr "Felhasználók értesítése arról, hogy gépel nekik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"A „gépelés” vagy „szünet” csevegésállapotok küldése. Jelenleg nem "
+"befolyásolja a „távol” állapotot."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "A WebKit fejlesztői eszközök, például a Web Inspector engedélyezve legyen-e."
+msgid "Use theme for chat rooms"
+msgstr "Téma használata a csevegőszobákhoz"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "Használandók-e kapcsolatkezelők az automatikus bontáshoz/újracsatlakozáshoz."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Használandó-e téma a csevegőszobákhoz."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Ellenőrzendők-e a beírt szavak az ellenőrizni kívánt nyelveken."
+msgid "Spell checking languages"
+msgstr "Helyesírás-ellenőrző nyelvei"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Hangulatjelek képekké alakítása társalgások közben."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"A helyesírás-ellenőrző által használandó nyelvek vesszővel elválasztott "
+"listája (például: „en, fr, hu”)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Engedélyezendő-e a Pulseaudio visszhang-csillapítási szűrője."
+msgid "Enable spell checker"
+msgstr "Helyesírás-ellenőrző engedélyezése"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Lejátsszon-e hangos értesítéseket, ha a partnerek bejelentkeznek a hálózatra."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Ellenőrzendők-e a beírt szavak az ellenőrizni kívánt nyelveken."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Lejátsszon-e hangos értesítéseket, ha a partnerek kijelentkeznek a "
-"hálózatból?"
+msgid "Nick completed character"
+msgstr "Kiegészített becenevet jelző karakter"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Lejátsszon-e hangot az eseményekre figyelmeztetésként."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Becenévhez fűzendő karakter becenév-kiegészítés (tab) használatakor "
+"csoportos csevegésben."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Lejátsszon-e hangot bejövő üzenetekre figyelmeztetésként."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Lejátsszon-e hangot új társalgásokra figyelmeztetésként."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Az Empathy a partner avatarját használja-e a csevegésablak ikonjaként."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Lejátsszon-e hangot kimenő üzenetekre figyelmeztetésként."
+msgid "Last account selected in Join Room dialog"
+msgstr "A csatlakozás szobához ablakban utoljára kiválasztott fiók"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Lejátsszon-e hangot a hálózatba bejelentkezéskor."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"A szobához csatlakozáshoz utoljára kiválasztott fiók D-Bus objektumútvonala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Lejátsszon-e hangot a hálózatból kijelentkezéskor."
+msgid "Camera device"
+msgstr "Kameraeszköz"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Lejátsszon-e hangos értesítéseket, ha Ön távol van vagy elfoglalt."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"A videohívásokban használandó alapértelmezett kameraeszköz, például /dev/"
+"video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Megjelenjenek-e felugró értesítések, ha egy partner távol állapotúvá válik."
+msgid "Camera position"
+msgstr "Kamerapozíció"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr ""
-"Megjelenjenek-e felugró értesítések, ha egy partner elérhető állapotúvá "
-"válik."
+msgid "Position the camera preview should be during a call."
+msgstr "A kamera-előnézet helye a hívás során."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Megjelenjenek-e felugró értesítések új üzenet érkezésekor akkor is, ha a "
-"csevegés meg van nyitva, de nincs fókuszban."
+msgid "Echo cancellation support"
+msgstr "Visszhang-csillapítás támogatása"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Megjelenjenek-e felugró értesítések új üzenet érkezésekor."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Engedélyezendő-e a Pulseaudio visszhang-csillapítási szűrője."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Megjelenjenek-e a fiókegyenlegek a partnerlistában."
+msgid "Show hint about closing the main window"
+msgstr "Tanács megjelenítése a főablak bezárásakor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
-"csevegőablakokban."
+"Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Kilépett partnerek megjelenítése a partnerlistában."
+msgid "Empathy can publish the user's location"
+msgstr "Az Empathy közzéteheti a felhasználó helyét"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Megjelenjenek-e felugró értesítések, ha Ön távol van vagy elfoglalt."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Az Empathy közzéteheti-e a felhasználó helyét a partnereinek."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Megjelenjenek-e az avatarok a partnerekhez a partnerlistában és "
-"csevegőablakokban."
+msgid "Empathy can use the network to guess the location"
+msgstr "Az Empathy használhatja a hálózatot a hely meghatározására"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Megjelenjen-e a partnerlista csevegőszobákban."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Az Empathy használhatja-e a hálózatot a hely meghatározására."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Megjelenjen-e a partnerlista tömör módban."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Az Empathy használhatja mobilhálózatot a hely meghatározására"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "Megjelenjen-e párbeszédablak a főablak bezárásakor a címsor X gombjával."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Az Empathy használhatja-e a mobilhálózatot a hely meghatározására."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Használandó-e téma a csevegőszobákhoz."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Az Empathy használhatja a GPS-t a hely meghatározására"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Az Empathy használhatja-e a GPS-t a hely meghatározására."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Az Empathy csökkentse-e a hely pontosságát?"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
-msgstr ""
-"A partnerlista rendezéséhez használandó feltétel. A lehetséges értékek: "
-"„name” (név szerint, ez az alapértelmezett) és „state” (állapot szerint)."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Az Empathy csökkentse-e adatvédelmi okokból a hely pontosságát."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Üzenetküldő- és VoIP-fiókok kezelése"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Nincs megadva ok"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Üzenetküldő- és VoIP-fiókok"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Állapotváltozás kérve"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Megszakította a fájlátvitelt"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "A partner megszakította a fájlátvitelt"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "Hiba a fájl átvitelekor"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "A partner nem képes a fájl átvitelére"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Ismeretlen ok"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "A fájlátvitel befejeződött, de a fájl megsérült"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "A távoli partner nem támogatja a fájlátvitelt"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "A kiválasztott fájl nem szabályos fájl"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "A kiválasztott fájl üres"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nem fogadott hívás ettől: %s"
@@ -518,168 +582,141 @@ msgstr "Felhívva: %s"
 msgid "Call from %s"
 msgstr "Hívás tőle: %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "A foglalattípus nem támogatott"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nincs megadva ok"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Állapotváltozás kérve"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Megszakította a fájlátvitelt"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "A partner megszakította a fájlátvitelt"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Hiba a fájl átvitelekor"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "A partner nem képes a fájl átvitelére"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Ismeretlen ok"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Elérhető"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Elfoglalt"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Távol"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Láthatatlan"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Kilépett"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nincs megadva ok"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Az állapot beállítva kilépettre"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Hálózati hiba"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "A hitelesítés meghiúsult"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Titkosítási hiba"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "A név használatban"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Nincs megadva tanúsítvány"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "A tanúsítvány nem megbízható"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "A tanúsítvány lejárt"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "A tanúsítvány nincs aktiválva"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "A tanúsítvány gépneve eltér"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "A tanúsítvány ujjlenyomata eltér"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "A tanúsítvány önaláírt"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Tanúsítványhiba"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "A titkosítás nem érhető el"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "A tanúsítvány érvénytelen"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "A kapcsolat visszautasítva"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "A kapcsolat nem hozható létre"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "A kapcsolat elveszett"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ez az erőforrás már kapcsolódik a kiszolgálóhoz"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "Ez a fiók már kapcsolódik a kiszolgálóhoz"
 
-#: ../libempathy/empathy-utils.c:356
-msgid "Connection has been replaced by a new connection using the same resource"
-msgstr "A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
+#: ../libempathy/empathy-utils.c:357
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr ""
+"A kapcsolatot leváltotta egy új, ugyanazt az erőforrást használó kapcsolat"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "A fiók már létezik a kiszolgálón"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "A kiszolgáló pillanatnyilag túl elfoglalt a kapcsolat kezeléséhez"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "A tanúsítvány visszavonva"
 
-#: ../libempathy/empathy-utils.c:365
-msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
+#: ../libempathy/empathy-utils.c:366
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "A tanúsítvány nem biztonságos titkosító algoritmust használ, vagy "
 "titkosításilag gyenge"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -687,283 +724,263 @@ msgstr ""
 "A kiszolgáló tanúsítványának hossza, vagy a kiszolgáló tanúsítványláncának "
 "mélysége túllépi a titkosítási programkönyvtár korlátozásait"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "A szoftver túl régi"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "Belső hiba"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Közeli emberek"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook csevegés"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d másodperce"
 msgstr[1] "%d másodperce"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d perce"
 msgstr[1] "%d perce"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d órája"
 msgstr[1] "%d órája"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d napja"
 msgstr[1] "%d napja"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d hete"
 msgstr[1] "%d hete"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d hónapja"
 msgstr[1] "%d hónapja"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "a jövőben"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Minden fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Jelszó"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Kiszolgáló"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Webes fiókjaim"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "A(z) %s fiók szerkesztésre kerül a(z) %s használatával."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "A(z) %s fiókot nem lehet szerkeszteni az Empathyban."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "A webes fiókjaim elindítása"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "%s szerkesztése"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Alkalmazás"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Bejele_ntkezés"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ez a fiók már létezik a kiszolgálón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Új fiók létrehozása a kiszolgálón"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "Mé_gse"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ezen: %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:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s fiók"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Új fiók"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Például:</b> Sajátnevem"
+#: ../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:"
+msgstr "_Jelszó:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Speciális"
+msgid "Screen _Name:"
+msgstr "Megjelenő _név:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Például:</b> Sajátnevem"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Jelszó:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Jelszó megjegyzése"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Jelszó megjegyzése"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Jelszó megjegyzése"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Megjelenő _név:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Kiszolgáló:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Mi az Ön AIM jelszava?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Speciális"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Mi az Ön AIM neve?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Mi az Ön AIM jelszava?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Kiszolgáló:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Például:</b> felhasználónév"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Jelszó megjegyzése"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Bejelentkezési a_zonosító:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Például:</b> felhasználónév"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Mi az Ön GroupWise felhasználói azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Mi az Ön GroupWise jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Például:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Karakterkészlet:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Mi az Ön ICQ UIN-ja?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Mi az Ön ICQ jelszava?"
 
@@ -1000,11 +1017,23 @@ msgstr "Beállítások"
 msgid "None"
 msgstr "Nincs"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Hálózat"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Hálózat:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Karakterkészlet:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Kiszolgálók"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1012,14 +1041,6 @@ msgstr ""
 "A legtöbb IRC-kiszolgáló nem kér jelszót, ha bizonytalan, akkor ne írjon be "
 "jelszót."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Hálózat"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Hálózat:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Becenév:"
@@ -1036,48 +1057,20 @@ msgstr "Kilépési üzenet:"
 msgid "Real name:"
 msgstr "Valódi név:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Kiszolgálók"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Mi az Ön IRC beceneve?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Melyik IRC-hálózat?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Például:</b> felhasznalo@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Például:</b> felhasznalo@jabber.hu"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Titkosítás szükséges (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL-tanúsítvány_hibák figyelmen kívül hagyása"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Kiszolgáló beállításainak felülbírálása"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Prioritás:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Mi az Ön IRC beceneve?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Erőforrás:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Mi az Ön Facebook felhasználóneve?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1090,179 +1083,203 @@ msgstr ""
 "Ha még nincs Facebook felhasználóneve, <a href=\"http://www.facebook.com/"
 "username/\">ezen az oldalon</a> választhat."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Régi SS_L használata"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Mi az Ön Facebook jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Mi az Ön Facebook felhasználóneve?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Mi az Ön Google azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Például:</b> felhasznalo@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Mi az Ön Google jelszava?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Például:</b> felhasznalo@jabber.hu"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL-tanúsítvány_hibák figyelmen kívül hagyása"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Prioritás:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Erőforrás:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Titkosítás szükséges (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Régi SS_L használata"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Kiszolgáló beállításainak felülbírálása"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Mi az Ön Jabber azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Mi az Ön Jabber jelszava?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Adja meg a kívánt Jabber azonosítót"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Mi az Ön Jabber jelszava?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Adja meg a kívánt Jabber jelszót"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Például:</b> felhasznalo@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Mi az Ön Windows Live azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Mi az Ön Windows Live jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_E-mail cím:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Be_cenév:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Vezetéknév:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Utónév:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Közzétett név:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber azonosító:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Vezetéknév:"
+msgid "E-_mail address:"
+msgstr "_E-mail cím:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Közzétett név:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Felhasználónév:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Például:</b> felhasznalo@sajat.sip.kiszolgalo"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Hitelesítési felhasználónév:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Kapcsolat feltérképezése"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "A STUN-kiszolgáló automatikus feltérképezése"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Ezen fiók használata _vezetékes és mobil telefonok hívására"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS-hibák figyelmen kívül hagyása"
+msgid "NAT Traversal Options"
+msgstr "NAT-bejárás beállításai"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Időköz (másodperc)"
+msgid "Proxy Options"
+msgstr "Proxy beállításai"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Kapcsolatfenntartás beállításai"
+msgid "Miscellaneous Options"
+msgstr "Egyéb beállítások"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Laza útválasztás"
+msgid "STUN Server:"
+msgstr "STUN kiszolgáló:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanizmus:"
+msgid "Discover the STUN server automatically"
+msgstr "A STUN-kiszolgáló automatikus feltérképezése"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Egyéb beállítások"
+msgid "Discover Binding"
+msgstr "Kapcsolat feltérképezése"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT-bejárás beállításai"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Kiszolgáló:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Kapcsolatfenntartás beállításai"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanizmus:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxy beállításai"
+msgid "Interval (seconds)"
+msgstr "Időköz (másodperc)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Hitelesítési felhasználónév:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Szállítás:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN kiszolgáló:"
+msgid "Loose Routing"
+msgstr "Laza útválasztás"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Kiszolgáló:"
+msgid "Ignore TLS Errors"
+msgstr "TLS-hibák figyelmen kívül hagyása"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Szállítás:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Ezen fiók használata _vezetékes és mobil telefonok hívására"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Mi az Ön SIP fiókjának jelszava?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Mi az Ön SIP felhasználói azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Felhasználónév:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Mi az Ön SIP fiókjának jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! a_zonosító:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások _figyelmen kívül hagyása"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Sz_obalista területi beállítása:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Mi az Ön Yahoo! azonosítója?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Mi az Ön Yahoo! jelszava?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! a_zonosító:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Sz_obalista területi beállítása:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1300,61 +1317,65 @@ msgstr "Minden fájl"
 msgid "Click to enlarge"
 msgstr "Kattintson ide a nagyításhoz"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Hiba történt a hívás indításakor"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "A megadott partner nem támogatja a hívásokat"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "A kiválasztott partner kilépett"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "A kiválasztott partner nem érvényes"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "A vészhívások nem támogatottak ezzel a protokollal"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Nincs elég kreditje a hívás végrehajtásához"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Nem sikerült privát csevegést nyitni"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "A téma nem támogatott ebben a csevegésben"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "A téma megváltoztatása nem engedélyezett"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "A(z) „%s” nem érvényes partnerazonosító"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: az aktuális társalgás összes üzenetének törlése"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <téma>: az aktuális társalgás témájának beállítása"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <szobaazonosító>: csatlakozás új csevegőszobához"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <szobaazonosító>: csatlakozás új csevegőszobához"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1362,23 +1383,23 @@ msgstr ""
 "/part [<csevegőszoba-azonosító>] [<ok>]: csevegőszoba elhagyása, "
 "alapértelmezés a jelenlegi"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <partnerazonosító> [<üzenet>]: privát csevegés megnyitása"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <partnerazonosító> <üzenet>: privát csevegés megnyitása"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <becenév>: becenév módosítása a jelenlegi kiszolgálón"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <üzenet>: tevékenység üzenet küldése az aktuális társalgásba"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1388,11 +1409,11 @@ msgstr ""
 "jellel kezdődő üzenetek küldésére használatos. Például: „/say /join "
 "#csevegőszoba, így léphet be új csevegőszobába”"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <partnerazonosító>: információk megjelenítése egy partnerről"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1400,113 +1421,129 @@ msgstr ""
 "/help [<parancs>]: minden támogatott parancs megjelenítése. Ha a <parancs> "
 "meg van adva, akkor annak használatát jeleníti meg."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Használat: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Ismeretlen parancs"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ismeretlen parancs, lásd a /help kimenetét az elérhető parancsokért"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "Az egyenleg nem elég az üzenet elküldéséhez"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "hiba a(z) „%s” üzenet elküldésekor: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Hiba az üzenet elküldésekor: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"Az egyenleg nem elég az üzenet elküldéséhez. <a href='%s'>Feltöltés</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "nem lehetséges"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "kilépett"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "érvénytelen partner"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "túl hosszú üzenet"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "nincs megvalósítva"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "hiba a(z) „%s” üzenet elküldésekor: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Hiba az üzenet elküldésekor: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Téma:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Téma beállítva: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "%s beállította a témát erre: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Nincs megadva témakör"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Nincs javaslat)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "„%s” hozzáadása a szótárhoz"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "„%s” hozzáadása a(z) %s szótárhoz"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Hangulatjel beszúrása"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Küldés"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Helyesírási javaslatok"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Nem sikerült lekérni a legutóbbi naplókat"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s kilépett"
@@ -1514,12 +1551,12 @@ msgstr "%s kilépett"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s kirúgta a következőt: %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s kirúgva"
@@ -1527,17 +1564,17 @@ msgstr "%s kirúgva"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s kitiltotta a következőt: %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s kitiltva"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s elhagyta a szobát"
@@ -1547,17 +1584,17 @@ msgstr "%s elhagyta a szobát"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s belépett a szobába"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s mostantól %s néven ismert"
@@ -1565,90 +1602,90 @@ msgstr "%s mostantól %s néven ismert"
 #. 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:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Kapcsolat bontva"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Szeretné tárolni ezt a jelszót?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Megjegyzés"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Most nem"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Újra"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Hibás jelszó, próbálja újra:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Ezt a szobát jelszó védi:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Csatlakozás"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Kapcsolódva"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Társalgás"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Ismeretlen vagy érvénytelen azonosító"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "A partnerblokkolás ideiglenesen nem érhető el"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "A partnerblokkolás nem érhető el"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Hozzáférés megtagadva"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "A partner nem blokkolható"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Blokkolt partnerek szerkesztése"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Felhasználói fiók:"
 
@@ -1658,463 +1695,380 @@ msgstr "Blokkolt partnerek"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Eltávolítás"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "Hivatkozás cí_mének másolása"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Hivatkozás megnyitása"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%Y. %B %e %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Partnerinformációk szerkesztése"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Személyes információk"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Új partner"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokkolja őt: %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Biztosan nem szeretné, hogy „%s” újra felvegye Önnel a kapcsolatot?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokkolás"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Partner jelentése visszaélőként"
 msgstr[1] "_Partnerek jelentése visszaélőként"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Döntés később"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Feliratkozási kérés"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Felhasználó blokkolása"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Csoportosítatlan"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Kedvenc partnerek"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Valóban el kívánja távolítani a(z) „%s” csoportot?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Csoport eltávolítása"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Eltávolítás"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Valóban el kívánja távolítani „%s” partnert?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Partner eltávolítása"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Partner _felvétele…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Partner _blokkolása"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Csevegés"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Hanghívás"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Videohívás"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "K_orábbi társalgások"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Fájl küldése"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Az asztalom megosztása"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Kedvenc"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Információk"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "S_zerkesztés"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Meghívás ebbe a szobába"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Meg_hívás csevegőszobába"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Döntés később"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Partnerek keresése"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Keresés: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Partner _felvétele"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nem található partner"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "A bemutatkozó üzenete:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Kérem engedélyezze, hogy láthassam az állapotát. Köszönöm!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Válasszon partnert"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Teljes név:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefonszám:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-mail cím:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Weboldal:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Születésnap:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Utoljára látszott:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Kapcsolódva innen:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Távol üzenet:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Csatornák:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Ország ISO kódja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Ország:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Állapot:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Város:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Terület:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Irányítószám:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Utca:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Épület:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Emelet:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Szoba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Szöveg:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Leírás:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Pontossági szint:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Hiba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Függőleges hiba (méter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vízszintes hiba (méter):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Irány:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Emelkedési sebesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Utolsó frissítés:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Hosszúság:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Szélesség:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Magasság:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Hely"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y. %B %e, %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Avatar mentése"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Az avatar nem menthető"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Hely</b> az időpontban\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Álnév:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Kliensinformációk"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Kliens:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "Személyes adatok"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Partner részletei"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "Teljes név"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "Telefonszám"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "E-mail cím"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "Weboldal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "Születésnap"
+
+#. 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 "Utoljára látszott:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Kapcsolódva innen:"
+
+#. 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 "Távol üzenet:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Work"
+msgid "work"
+msgstr "munkahelyi"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "otthoni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Mobile"
+msgid "mobile"
+msgstr "mobil"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "hang"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "előnyben részesített"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postai "
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "postafiók"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Azonosító:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Álnév:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Hely</b> az időpontban\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Információk lekérve…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Kliensinformációk"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Verzió:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Kliens:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Csoportok"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2122,105 +2076,171 @@ msgstr ""
 "Válassza ki azokat a csoportokat, amelyekben a partner megjelenjen, "
 "kiválaszthat nulla vagy több csoportot is."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Csoport _hozzáadása"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Kijelölés"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Csoport"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "A következő azonosító blokkolva lesz:"
 msgstr[1] "A következő azonosítók blokkolva lesznek:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "A következő azonosító nem blokkolható:"
 msgstr[1] "A következő azonosítók nem blokkolhatók:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Összekapcsolt partnerek"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Válasszon összekapcsolandó partnereket"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Új partner előnézete"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "A bal oldali listában kiválasztott partnerek össze lesznek kapcsolva."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Partnerinformációk szerkesztése"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Válassza ki a fiókot a hívás indításához"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Hívás"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Munkahelyi"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "OTTHONI"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "Partner _blokkolása"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Csevegés"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Hanghívás"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Videohívás"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "K_orábbi társalgások"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Fájl küldése"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Az asztalom megosztása"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Kedvenc"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "A gnome-contacts nincs telepítve"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "A partneradatok eléréséhez telepítse a gnome-contacts alkalmazást."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Információk"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Partnerek összekapcsolása…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Meghívás ebbe a szobába"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Meg_hívás csevegőszobába"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Partner _felvétele…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "_Törlés és blokkolás"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Valóban el kívánja távolítani a(z) „%s” csoportot?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Csoport eltávolítása"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Eltávolítás"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Valóban el kívánja távolítani „%s” partnert?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2229,7 +2249,11 @@ msgstr ""
 "Valóban el akarja távolítani a(z) %s gyűjtőpartnert? Ne feledje, hogy ez "
 "minden partnert eltávolít, amelyek ezt a gyűjtőpartnert alkotják."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Partner eltávolítása"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2240,23 +2264,23 @@ msgstr[1] "%u partnert tartalmazó gyűjtőpartner"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Hely</b> az időpontban"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Telefonról vagy mobil eszközről lépett be"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Új hálózat"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Válasszon IRC-hálózatot"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_Hálózatok listájának visszaállítása"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Kijelölés"
@@ -2269,247 +2293,263 @@ msgstr "új kiszolgáló"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Partnerek összekapcsolása"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "S_zétválasztás…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "A megjelenített gyűjtőpartner szétvágása az azt alkotó partnerekké."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "Összekap_csolás"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Szétválasztja a(z) „%s” gyűjtőpartnert?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Biztos, hogy szétválasztja ezt a gyűjtőpartnert? Ez a gyűjtőpartnert "
-"véglegesen az azt alkotó partnerekké választja szét."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "S_zétválasztás"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Előzmények"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Megjelenítés"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Keresés"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Csevegés itt: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Csevegés vele: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y. %B %e %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s másodperc"
 msgstr[1] "%s másodperc"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s perc"
 msgstr[1] "%s perc"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Hívás hossza: %s, befejezve: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Ma"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y. %B %e"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Bármikor"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Bárki"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Ki"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Mikor"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Bármi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Szöveges csevegések"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Bejövő hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Kimenő hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Nem fogadott hívások"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Mi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Biztosan törölni szeretné a korábbi társalgások minden naplóját?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Összes törlése"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Törlés innen:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Betöltés…</span>"
+msgid "_File"
+msgstr "_Fájl"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Csevegés"
+#: ../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_zerkesztés"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Minden előzmény törlése…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Videó"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Csevegés"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "S_zerkesztés"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Videó"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Fájl"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "2. oldal"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Partnerazonosító:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Betöltés…</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Cse_vegés"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "A partner kilépett"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "A kiválasztott partner nem érvényes vagy ismeretlen"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr "A partner nem támogatja ezt a fajta csevegést"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "A kért funkció nincs megvalósítva ehhez a protokollhoz"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Nem kezdhető társalgás a kiválasztott partnerrel"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Kitiltották erről a csatornáról"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "A csatorna tele van"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "Ehhez a csatornához csak meghívással csatlakozhat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "Ez nem folytatható, amíg kilépett állapotban van"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "Hozzáférés megtagadva"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "Hiba történt a társalgás indításakor"
+
+#: ../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 "Adjon meg egy partnerazonosítót vagy telefonszámot:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Új társalgás"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "_Videó küldése"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "_Videohívás"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Hívás"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "_Hanghívás"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Új hívás"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "A hitelesítés meghiúsult a(z) <b>%s</b> fiókhoz"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2546,12 +2586,8 @@ msgstr "Kattintson ezen állapot kedvenccé tételéhez"
 msgid "Set status"
 msgstr "Állapot beállítása"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Jelenlét és aktuális állapot megadása"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Egyéni üzenetek…"
 
@@ -2559,7 +2595,7 @@ msgstr "Egyéni üzenetek…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Új %s fiók"
@@ -2569,20 +2605,20 @@ msgid "Find:"
 msgstr "Keresés:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Kis- és _nagybetűk"
+msgid "_Previous"
+msgstr "_Előző"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "A kifejezés nem található"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Következő"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Kis- és _nagybetűk"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Előző"
+msgid "Phrase not found"
+msgstr "A kifejezés nem található"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2628,12 +2664,12 @@ msgstr "A hanghívás befejeződött"
 msgid "Edit Custom Messages"
 msgstr "Egyéni üzenetek szerkesztése"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Üzenet szerkesztve ekkor: %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normál"
 
@@ -2675,14 +2711,16 @@ msgstr "A tanúsítvány nem rendelkezik a várt ujjlenyomattal."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "A tanúsítvány által ellenőrzött gépnév nem egyezik a kiszolgáló nevével."
+msgstr ""
+"A tanúsítvány által ellenőrzött gépnév nem egyezik a kiszolgáló nevével."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
 msgstr "A tanúsítvány önaláírt."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-msgid "The certificate has been revoked by the issuing Certification Authority."
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "A tanúsítványt visszavonta a kibocsátó hitelesítésszolgáltató."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
@@ -2708,34 +2746,39 @@ msgid "Certificate hostname: %s"
 msgstr "A tanúsítvány gépneve: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Folytatás"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "_Folytatás"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nem megbízható kapcsolat"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "A kapcsolat nem megbízható, mindenképp folytatja?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Emlékezzen a válaszra a jövőbeli kapcsolatokhoz"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Tanúsítvány részletei"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Az URI nem nyitható meg"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Válasszon ki egy fájlt"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Nincs elég szabad hely a fájl mentéséhez"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2744,7 +2787,7 @@ msgstr ""
 "%s szabad hely szükséges a fájl mentéséhez, de csak %s érhető el. Válasszon "
 "másik helyet."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Bejövő fájl %s partnertől"
@@ -2916,39 +2959,31 @@ msgstr "Nyugati"
 msgid "Vietnamese"
 msgstr "Vietnami"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "A kiválasztott partner nem képes fájlok fogadására."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "A kiválasztott partner kilépett."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nincs hibaüzenet"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Azonnali üzenet (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ne kapcsolódjon indításkor"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne jelenjen meg a partnerlista vagy más ablak indításkor"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Hiba a fiókkezelő elérésekor"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2994,234 +3029,94 @@ msgstr ""
 "nem kapta meg, írjon a Free Software Foundation Inc.-nek. Levélcímük: 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "A GNOME üzenetküldő-kliense"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Kelemen Gábor <kelemeng at gnome dot hu>\n"
 "Meskó Balázs <meskobalazs at gmail dot com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Hiba történt a fiókok importálásakor."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Hiba történt a fiókrészletek feldolgozásakor."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Hiba történt a fiók létrehozásakor."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Hiba történt."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A hibaüzenet: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Visszaléphet és megpróbálhatja újra megadni a fiókja részleteit, vagy "
-"kiléphet ebből az asszisztensből és később a Szerkesztés menüből vehet fel "
-"fiókokat."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Hiba történt"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Milyen típusú csevegőfiókja van?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Van más fiókja, amit be szeretne állítani?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Adja meg fiókjának adatait"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Milyen típusú csevegőfiókot szeretne létrehozni?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Szeretne létrehozni más csevegőfiókokat?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Adja meg az új fiók részleteit"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Az Empathy segítségével cseveghet a közelében elérhető emberekkel, valamint "
-"a Google Talkot, AIM-ot, MSN-t és sok más csevegőprogramot használó "
-"barátaival és kollégáival. Ha rendelkezik mikrofonnal és webkamerával, akkor "
-"hang- és videohívásokat is bonyolíthat."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Rendelkezik más csevegőprogramokban már használt fiókkal?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Igen, fiókadatok importálása ebből: "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Igen, megadom a fiókom adatait"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nem, új fiókot szeretnék készíteni"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nem, csak a környezetemben épp elérhető embereket szeretném látni"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Válassza ki az importálandó fiókot:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Igen"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nem, most csak ennyit akartam"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Az Empathy képes automatikusan feltérképezni az Önével azonos hálózatra "
-"csatlakozó felhasználókat, és csevegni velük. Ha használni szeretné ezt a "
-"szolgáltatást, akkor ellenőrizze a lenti részletek helyességét. Ezeket "
-"később is egyszerűen módosíthatja, vagy letilthatja a „Fiókok” ablak "
-"segítségével."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Szerkesztés → Fiókok"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_Egyelőre nem engedélyezem ezt a szolgáltatást"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Nem lesz képes a helyi hálózatára csatlakozó személyekkel csevegni, mert "
-"nincs telepítve a telepathy-salut. Ha be szeretné kapcsolni ezt a "
-"szolgáltatást, akkor telepítse a telepathy-salut csomagot, és hozzon létre "
-"egy Közeli emberek fiókot a Fiókok ablakban."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "A telepathy-salut nincs telepítve"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Üzenetküldő- és VoIP-fiók varázsló"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Üdvözöljük az Empathyban"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Meglévő fiókok importálása"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Adja meg személyes adatait"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Az Ön %s fiókjának módosításai nincsenek elmentve."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Új fiókja még nincs elmentve."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Kapcsolódás…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Kilépett – %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Kapcsolat bontva – %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Kilépett – Nincs hálózati kapcsolat"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"A fiók letiltva, mert egy régi, nem támogatott háttérprogramot használ. "
+"Telepítse a telepathy-haze csomagot, és indítsa újra a munkamenetet a fiók "
+"átköltöztetéséhez."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Kilépett – Fiók letiltva"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Új fiók létrehozására készül, ezzel törölni fogja a módosításokat.\n"
-"Biztosan folytatni akarja?"
+#: ../src/empathy-accounts-dialog.c:572
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr "Kapcsolatparaméterek szerkesztése"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "A személyes adatainak lekérése meghiúsult a kiszolgálóról."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Személyes információnak szerkesztése online."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Kapcsolatparaméterek szerkesztése…"
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Valóban el kívánja távolítani a(z) %s fiókot a számítógépről?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ez nem távolítja el a kiszolgálón lévő fiókot."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3230,15 +3125,24 @@ msgstr ""
 "Biztosan folytatni akarja?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Engedélyezés"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Letiltás"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Kihagyás"
+
+#: ../src/empathy-accounts-dialog.c:2126
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "Kapcs_olódás"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,19 +3154,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Hozzáadás…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Fiókinformációk betöltése"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nincs telepítve protokoll"
+msgid "_Import…"
+msgstr "_Importálás…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Fiókinformációk betöltése"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3270,132 +3170,118 @@ msgstr ""
 "Új fiók létrehozásához először telepítenie kell egy háttérprogramot minden "
 "használandó protokollhoz."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importálás…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "Nincsenek telepítve protokoll-háttérprogramok"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " – Empathy hitelesítési kliens"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy hitelesítési kliens"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Közeli emberek"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "– Empathy hang/videó kliens"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy hang/videó kliens"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontraszt"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Fényerő"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "Hangerő"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_Oldalsáv"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "Hangbemenet"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Videobemenet"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "Tárcsázókészülék"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Részletek"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "%s hívása"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "A gép által látott IP-cím"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Az interneten lévő kiszolgáló által látott IP-cím"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "A partner másik oldal által látott IP-címe"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Közvetítő kiszolgáló IP-címe"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Üzenetszórási csoport IP-címe"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1835
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#| msgid "Unknown"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Kapcsolódva – %d.%02dp"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Technikai részletek"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3404,8 +3290,8 @@ msgstr ""
 "%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
 "hangformátumot sem"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3414,8 +3300,8 @@ msgstr ""
 "%s szoftvere nem érti az Ön számítógépe által támogatott egyik "
 "videoformátumot sem"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3424,23 +3310,26 @@ msgstr ""
 "Nem hozható létre kapcsolat %s partnerhez. Lehet, hogy egyikük közvetlen "
 "kapcsolatot nem engedélyező hálózatot használ."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Hálózati hiba történt"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
-msgid "The audio formats necessary for this call are not installed on your computer"
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
 msgstr "A híváshoz szükséges hangformátumok nincsenek telepítve a számítógépre"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr ""
+"A híváshoz szükséges videoformátumok nincsenek telepítve a számítógépre"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3451,262 +3340,314 @@ msgstr ""
 "a hibát</a>, és csatolja a Súgó menü „Hibakeresés” ablakából elérhető "
 "naplókat."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Hiba történt a hívási alrendszerben"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "A folyam vége elérve"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Nem hozható létre a hangfolyam"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Nem hozható létre a videofolyam"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Hang"
+msgid "_Call"
+msgstr "_Hívás"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Dekódoló kodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Kamera letiltása"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Tárcsázókészülék megjelenítése"
+msgid "_Settings"
+msgstr "_Beállítások"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kódoló kodek:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Nézet"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Befejezés"
+#: ../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 "_Súgó"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Aktuális hívás befejezése"
+#: ../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 "_Tartalom"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Helyi jelölt:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Hibakeresés"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximalizálás"
+msgid "Swap camera"
+msgstr "Kamera cseréje"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimalizálás"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Távoli jelölt:"
+msgid "Maximise me"
+msgstr "Maximalizálás"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Hang küldése"
+msgid "Disable camera"
+msgstr "Kamera letiltása"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Videó küldése"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Befejezés"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Tárcsázókészülék"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Aktuális hívás befejezése"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videohívás"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Videohívás indítása"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Hanghívás indítása"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Kamera cseréje"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Hangátvitel be/ki"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Videoátvitel be/ki"
+msgid "Show dialpad"
+msgstr "Tárcsázókészülék"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Ismeretlen"
+msgid "Display the dialpad"
+msgstr "Tárcsázókészülék megjelenítése"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Videó küldése"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videohívás"
+msgid "Toggle video transmission"
+msgstr "Videoátvitel be/ki"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Hívás"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Hang küldése"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Tartalom"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Hangátvitel be/ki"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Hibakeresés"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kódoló kodek:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Súgó"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Dekódoló kodek:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Távoli jelölt:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Beállítások"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Helyi jelölt:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Nézet"
+msgid "Audio"
+msgstr "Hang"
+
+#: ../src/empathy-chat-window.c:289
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "Bezárja ezt az ablakot?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Az ablak bezárásával elhagyja ezt: %s. Az újracsatlakozásig nem fog további "
+"üzeneteket kapni."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Az ablak bezárásával elhagyja a csevegőszobát. Az újracsatlakozásig nem fog "
+"további üzeneteket kapni."
+msgstr[1] ""
+"Az ablak bezárásával elhagy %u csevegőszobát. Az újracsatlakozásig nem fog "
+"további üzeneteket kapni."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "Elhagyja ezt: %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Az újracsatlakozásig nem fog további üzeneteket kapni ebből a "
+"csevegőszobából."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Ablak bezárása"
+
+#: ../src/empathy-chat-window.c:334
+#| msgid "Level "
+msgid "Leave room"
+msgstr "Szoba elhagyása"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d olvasatlan)"
 msgstr[1] "%s (%d olvasatlan)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (és %u egyéb)"
 msgstr[1] "%s (és %u egyéb)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d olvasatlan másoktól)"
 msgstr[1] "%s (%d olvasatlan másoktól)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d olvasatlan mindenkitől)"
 msgstr[1] "%s (%d olvasatlan mindenkitől)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d üzenet küldése"
 msgstr[1] "%d üzenet küldése"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Üzenet írása."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Törlés"
+msgid "_Conversation"
+msgstr "_Társalgás"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Partner"
+msgid "C_lear"
+msgstr "_Törlés"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ha_ngulatjel beszúrása"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Kedvenc csevegőszoba"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "_Résztvevő meghívása…"
+msgid "Notify for All Messages"
+msgstr "Értesítés az összes hibaüzenetről"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Lap _balra"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Partnerlista m_utatása"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Lap j_obbra"
+msgid "Invite _Participant…"
+msgstr "_Résztvevő meghívása…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Értesítés az összes hibaüzenetről"
+msgid "C_ontact"
+msgstr "_Partner"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Társalgás"
+msgid "_Tabs"
+msgstr "_Lapok"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Lap leválasztása"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Kedvenc csevegőszoba"
+msgid "_Previous Tab"
+msgstr "_Előző lap"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Következő lap"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Előző lap"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Lapbezárás _visszavonása"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Partnerlista m_utatása"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Lap _balra"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Lapok"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Lap j_obbra"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Lapbezárás _visszavonása"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Lap leválasztása"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3720,100 +3661,100 @@ msgstr "Szoba"
 msgid "Auto-Connect"
 msgstr "Automatikus kapcsolódás"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Kedvenc szobák kezelése"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Bejövő videohívás"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Bejövő hívás"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s videón hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s hívja, válaszol?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Bejövő hívás %s partnertől"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Válasz"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Válasz videóval"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Bejövő videohívás %s partnertől"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Szobameghívás"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Meghívás a csatlakozásra ehhez: %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s kéri, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Elutasítás"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Csatlakozás"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s megkérte, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Megkérték, hogy csatlakozzon ehhez: %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Bejövő fájlátvitel %s partnertől"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s engedélyt kér, hogy láthassa az Ön elérhető állapotát"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3823,105 +3764,105 @@ msgstr ""
 "Üzenet: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s, összesen %s; %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "„%s” fogadása %s partnertől"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "„%s” küldése %s partnernek"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Hiba „%s” fogadásakor %s partnertől"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Hiba a fájl fogadásakor"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Hiba „%s” küldésekor %s partnernek"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Hiba a fájl küldésekor"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s” érkezett %s partnertől"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "„%s” elküldve %s partnernek"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "A fájlátvitel befejeződött"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Várakozás a partner válaszára"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "„%s” integritásának ellenőrzése"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "„%s” ellenőrzése"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fájl"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Hátralévő"
 
@@ -3931,9 +3872,15 @@ msgstr "Fájlátvitelek"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Befejezett, megszakított és meghiúsult átvitelek eltávolítása a listából"
+msgstr ""
+"Befejezett, megszakított és meghiúsult átvitelek eltávolítása a listából"
+
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "_Importálás"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3941,171 +3888,197 @@ msgstr ""
 "Nem találhatók importálható fiókok. Az Empathy jelenleg csak a Pidginből "
 "támogatja a fiókok importálását."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Fiókok importálása"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importálás"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Forrás"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Adja meg a jelszót"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Leválasztás"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Be kell állítani egy fiókot, hogy itt partnereket láthasson."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nincs találat"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Elnézést, a(z) %s fiókok nem használhatók a(z) %s szoftver frissítéséig."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Szoftver frissítése…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Bezárás"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Újracsatlakozás"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Fiók szerkesztése"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Bezárás"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "%s feltöltése (%s)…"
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fiókegyenleg feltöltése"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Feltöltés…"
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Partner"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Engedélyezni kell az egyik fiókját, hogy itt partnereket láthasson."
+
+#. 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 "Engedélyezni kell ezt: %s, hogy itt partnereket láthasson."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Partnerlista"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "_Partnerek térképen"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "Fiókbeállítások"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Egyenleg"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Új _társalgás…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "_Keresés a partnerlistában"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Új _hívás…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "_Csatlakozás a kedvencekhez"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "Partnerek _keresése…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Kedvencek kezelése"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Fájlátvitelek"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormál méret"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Kilé_pett partnerek"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Új _hívás…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_Protokollok megjelenítése"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normál méret _avatarokkal"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Egyenleg"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "_Partnerek térképen"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Fiókok"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Bl_okkolt partnerek"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "B_eállítások"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_Protokollok megjelenítése"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "_Keresés a partnerlistában"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Rendezés _név szerint"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Rendezés álla_pot szerint"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Fiókok"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normál méret _avatarokkal"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Bl_okkolt partnerek"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormál méret"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Tömör méret"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Fájlátvitelek"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "Sz_oba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Csatlakozás…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Új _társalgás…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Kilé_pett partnerek"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "S_zemélyes információk"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "Sz_oba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "_Csatlakozás a kedvencekhez"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "Partnerek _keresése…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Kedvencek kezelése"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Csevegőszoba"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Tagok"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4118,30 +4091,40 @@ msgstr ""
 "Jelszó szükséges: %s\n"
 "Tagok: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Igen"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nem"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Nem indítható a szobalistázás"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Nem állítható le a szobalistázás"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Nem tölthető be a szobalista"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Csatlakozás a szobához"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid "Enter the room name to join here or click on one or more rooms in the list."
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 "Itt adja meg a szoba nevét a csatlakozáshoz, vagy kattintson néhány, a "
 "listán látható szobára."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Sz_oba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4149,379 +4132,398 @@ msgstr ""
 "Adja meg a szobát üzemeltető kiszolgáló nevét, vagy hagyja üresen ha a szoba "
 "a jelenlegi fiókéval egyező kiszolgálón van"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Csatlakozás a szobához"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Nem tölthető be a szobalista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Szobalista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sz_oba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Üzenet érkezett"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Üzenet elküldve"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Új társalgás"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Partner belép"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Partner kilép"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Fiók kapcsolódott"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Fiók kapcsolata bontva"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Nyelv"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Júlia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 # http://mek.oszk.hu/00400/00492/00492.htm
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ó, Romeo, mért vagy te Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Tagadd meg az atyád, neved hajítsd el,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "S ha nem teszed meg, esküdj édesemmé"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "És nem leszek Capulet én se többé."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Hallgassak-e vagy szóljak-e neki?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Júlia kilépett"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Beállítások"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "_Hangulatjelek képekké alakítása"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Partnerlista m_utatása szobákban"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Megjelenés"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Viselkedés"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Csevegések indítása itt:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Csevegés té_mája:"
+msgid "new ta_bs"
+msgstr "új lap_ok"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "É_rtesítések tiltása, ha távol vagy elfoglalt vagyok"
+msgid "new _windows"
+msgstr "új _ablakok"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Hangok tiltása, ha _távol vagy elfoglalt vagyok"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Bejövő események megjelenítése az értesítési területen"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "A_utomatikus kapcsolódás indításkor"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"A visszhang-csillapítás segítségével hangja tisztábban fog hallatszani a másik "
-"félnél, de egyes számítógépeken problémákat okozhat. Ha Ön vagy a hívott "
-"partner fura zajokat vagy hanghibákat hall a hívás során, akkor próbálja meg "
-"kikapcsolni a visszhang-csillapítást, és újraindítani a hívást."
+msgid "Log conversations"
+msgstr "Társalgások naplózása"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Értesítések engedélyezése, ha a partnerek elérhetővé válnak"
+msgid "Behavior"
+msgstr "Viselkedés"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Értesítések engedélyezése, ha a partnerek elérhetetlenné válnak"
+msgid "General"
+msgstr "Általános"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Értesítések engedélyezése, ha a cse_vegés nincs fókuszban"
+msgid "_Enable bubble notifications"
+msgstr "B_uborékértesítések engedélyezése"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Helyesírás-ellenőrzés ezen nyelveken:"
+msgid "Disable notifications when _away or busy"
+msgstr "É_rtesítések tiltása, ha távol vagy elfoglalt vagyok"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Általános"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Értesítések engedélyezése, ha a cse_vegés nincs fókuszban"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Bemeneti szint:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Értesítések engedélyezése, ha a partnerek elérhetővé válnak"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Bemeneti hangerő:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Értesítések engedélyezése, ha a partnerek elérhetetlenné válnak"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Értesítések"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Helyforrások:"
+msgid "_Enable sound notifications"
+msgstr "H_angos értesítések engedélyezése"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Társalgások naplózása"
+msgid "Disable sounds when _away or busy"
+msgstr "Hangok tiltása, ha _távol vagy elfoglalt vagyok"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Értesítések"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Hang lejátszása eseményekhez"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Hangok"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Adatvédelem"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Hívásminőség javítása _visszhangcsillapítás használatával"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"A hely pontosságának csökkentése azt jelenti, hogy a tartózkodási helyéről "
-"csak a város, megye és ország lesz közzétéve. A GPS koordináták 1 decimális "
-"hely pontosságúak lesznek."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "_Hangulatjelek képekké alakítása"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Partnerlista m_utatása szobákban"
+"A visszhang-csillapítás segítségével hangja tisztábban fog hallatszani a "
+"másik félnél, de egyes számítógépeken problémákat okozhat. Ha Ön vagy a "
+"hívott partner fura zajokat vagy hanghibákat hall a hívás során, akkor "
+"próbálja meg kikapcsolni a visszhang-csillapítást, és újraindítani a hívást."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Hangok"
+msgid "_Publish location to my contacts"
+msgstr "_Hely közzététele a partnereimnek"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Helyesírás-ellenőrzés"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"Ezen az oldalon csak azok a nyelvek vannak felsorolva, amelyekhez telepítve "
-"van szótár."
+"A hely pontosságának csökkentése azt jelenti, hogy a tartózkodási helyéről "
+"csak a város, megye és ország lesz közzétéve. A GPS koordináták 1 decimális "
+"hely pontosságúak lesznek."
 
+#. 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 "Themes"
-msgstr "Témák"
+msgid "_Reduce location accuracy"
+msgstr "Hely pontosságának _csökkentése"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Hívásminőség javítása _visszhangcsillapítás használatával"
+msgid "Privacy"
+msgstr "Adatvédelem"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Változat:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "A_utomatikus kapcsolódás indításkor"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "B_uborékértesítések engedélyezése"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Hálózat (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "H_angos értesítések engedélyezése"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Helyforrások:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ezen az oldalon csak azok a nyelvek vannak felsorolva, amelyekhez telepítve "
+"van szótár."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Hálózat (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Helyesírás-ellenőrzés ezen nyelveken:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "Új csevegések megnyitása _külön ablakokban"
+msgid "Spell Checking"
+msgstr "Helyesírás-ellenőrzés"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Hely közzététele a partnereimnek"
+msgid "Chat Th_eme:"
+msgstr "Csevegés té_mája:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Változat:"
 
-#. 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:41
-msgid "_Reduce location accuracy"
-msgstr "Hely pontosságának _csökkentése"
+msgid "Themes"
+msgstr "Témák"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Állapot"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Partner újrahívása"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera ki"
+msgid "Redial"
+msgstr "Újratárcsázás"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera be"
+msgid "V_ideo"
+msgstr "Vi_deó"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Videó ki"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Kamera kikapcsolása és a képküldés leállítása"
+msgid "Video Preview"
+msgstr "Videoelőnézet"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Kamera bekapcsolása és kép küldése"
+msgid "Video On"
+msgstr "Videó be"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Kamera bekapcsolása, de ne küldjön képet"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Partner újrahívása"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Előnézet"
+msgid "Camera Off"
+msgstr "Kamera ki"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Újratárcsázás"
+msgid "Disable camera and stop sending video"
+msgstr "Kamera kikapcsolása és a képküldés leállítása"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Vi_deó"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Előnézet"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Videó ki"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Kamera bekapcsolása, de ne küldjön képet"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Videó be"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera be"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videoelőnézet"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Kamera bekapcsolása és kép küldése"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Partner térképnézete"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Mentés"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin hivatkozás"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin válasz"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Túl nagy egyetlen beillesztéshez. Mentse a naplókat fájlba."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Hibakeresési ablak"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Küldés pastebinbe"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Szünet"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Szint "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Információ"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Üzenet"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritikus"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Hiba"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Idő"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Tartomány"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategória"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Szint"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4529,127 +4531,434 @@ msgstr ""
 "A kiválasztott kapcsolatkezelő nem támogatja a távoli hibakeresési "
 "kiterjesztést."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Résztvevő meghívása"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Válassza ki a társalgásba meghívandó partnert:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Meghívás"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ne jelenítsen meg párbeszédeket, a feladatok (például importálás) végén "
 "lépjen ki"
 
-#: ../src/empathy-accounts.c:187
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Ne jelenítsen meg ablakokat, kivéve ha csak „Közeli emberek” fiókok vannak"
+#: ../src/empathy-accounts.c:184
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+"Ne jelenítsen meg ablakokat, kivéve ha csak „Közeli emberek” fiókok vannak"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "A megadott fiók kiválasztása (például: gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"A megadott fiók kiválasztása (például: gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<fiókazonosító>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "– Empathy fiókkezelő"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy fiókkezelő"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Adott szolgáltatás megjelenítése"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "– Empathy hibakereső"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy hibakereső"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "– Empathy üzenetküldő-kliens"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Válasz"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Visszautasítás"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Válasz"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Válasz videóval"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Visszalépés"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Elfogadás"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Megadás"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s megpróbálta felhívni, de Ön egy másik beszélgetést folytatott."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Várakoztatás"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Némítás"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Időtartam"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d.%02dp"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Jelenlegi egyenlege: %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Elnézést, nincs elég kreditje ehhez a híváshoz."
+
+#: ../src/empathy-call-window.c:3167
+#| msgid "Top Up..."
+msgid "Top Up"
+msgstr "Feltöltés"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Kis- és _nagybetű"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Milyen típusú csevegőfiókja van?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "Új fiók hozzáadása"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Közeli emberek"
+
+#: ../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 ""
+"Az Empathy képes automatikusan feltérképezni az Önével azonos hálózatra "
+"csatlakozó felhasználókat, és csevegni velük. Ha használni szeretné ezt a "
+"szolgáltatást, akkor ellenőrizze a lenti részletek helyességét."
+
+#: ../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 ""
+"Ezeket az adatokat később is módosíthatja, vagy letilthatja a szolgáltatást "
+"a <span style=\"italic\">Szerkesztés → Fiókok</span> segítségével."
+
+#~ msgid "Call volume"
+#~ msgstr "Hívás hangereje"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Hívás hangereje százalékban."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Az Empathy átköltöztette az MSN-naplókat"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Az Empathy átköltöztette-e az MSN naplókat."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "A foglalattípus nem támogatott"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Webes fiókjaim"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "A(z) %s fiók szerkesztésre kerül a(z) %s használatával."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "A(z) %s fiókot nem lehet szerkeszteni az Empathyban."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "A webes fiókjaim elindítása"
+
+#~ msgid "Edit %s"
+#~ msgstr "%s szerkesztése"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Mé_gse"
+
+#~ msgid "Personal Information"
+#~ msgstr "Személyes információk"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Csoportosítatlan"
+
+#~ msgid "Favorite People"
+#~ msgstr "Kedvenc partnerek"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "S_zerkesztés"
+
+#~ msgid "Select a contact"
+#~ msgstr "Válasszon partnert"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Összekapcsolt partnerek"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Válasszon összekapcsolandó partnereket"
+
+#~ msgid "New contact preview"
+#~ msgstr "Új partner előnézete"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "A bal oldali listában kiválasztott partnerek össze lesznek kapcsolva."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Partnerek összekapcsolása…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Partnerek összekapcsolása"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "S_zétválasztás…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "A megjelenített gyűjtőpartner szétvágása az azt alkotó partnerekké."
+
+#~ msgid "_Link"
+#~ msgstr "Összekap_csolás"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Szétválasztja a(z) „%s” gyűjtőpartnert?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Biztos, hogy szétválasztja ezt a gyűjtőpartnert? Ez a gyűjtőpartnert "
+#~ "véglegesen az azt alkotó partnerekké választja szét."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "S_zétválasztás"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Partnerazonosító:"
+
+#~ msgid "C_hat"
+#~ msgstr "Cse_vegés"
+
+#~ msgid "Send _Video"
+#~ msgstr "_Videó küldése"
+
+#~ msgid "C_all"
+#~ msgstr "_Hívás"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Jelenlét és aktuális állapot megadása"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "A kiválasztott partner nem képes fájlok fogadására."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "A kiválasztott partner kilépett."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Hiba történt a fiókok importálásakor."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Hiba történt a fiókrészletek feldolgozásakor."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Hiba történt a fiók létrehozásakor."
+
+#~ msgid "There was an error."
+#~ msgstr "Hiba történt."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "A hibaüzenet: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Visszaléphet és megpróbálhatja újra megadni a fiókja részleteit, vagy "
+#~ "kiléphet ebből az asszisztensből és később a Szerkesztés menüből vehet "
+#~ "fel fiókokat."
+
+#~ msgid "An error occurred"
+#~ msgstr "Hiba történt"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Van más fiókja, amit be szeretne állítani?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Adja meg fiókjának adatait"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Milyen típusú csevegőfiókot szeretne létrehozni?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Szeretne létrehozni más csevegőfiókokat?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Adja meg az új fiók részleteit"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Az Empathy segítségével cseveghet a közelében elérhető emberekkel, "
+#~ "valamint a Google Talkot, AIM-ot, MSN-t és sok más csevegőprogramot "
+#~ "használó barátaival és kollégáival. Ha rendelkezik mikrofonnal és "
+#~ "webkamerával, akkor hang- és videohívásokat is bonyolíthat."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Rendelkezik más csevegőprogramokban már használt fiókkal?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Igen, fiókadatok importálása ebből: "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Igen, megadom a fiókom adatait"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nem, új fiókot szeretnék készíteni"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nem, csak a környezetemben épp elérhető embereket szeretném látni"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Válassza ki az importálandó fiókot:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nem, most csak ennyit akartam"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Szerkesztés → Fiókok"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Egyelőre nem engedélyezem ezt a szolgáltatást"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Nem lesz képes a helyi hálózatára csatlakozó személyekkel csevegni, mert "
+#~ "nincs telepítve a telepathy-salut. Ha be szeretné kapcsolni ezt a "
+#~ "szolgáltatást, akkor telepítse a telepathy-salut csomagot, és hozzon "
+#~ "létre egy Közeli emberek fiókot a Fiókok ablakban."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Üzenetküldő- és VoIP-fiók varázsló"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Üdvözöljük az Empathyban"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Meglévő fiókok importálása"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Adja meg személyes adatait"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Új fiók létrehozására készül, ezzel törölni fogja a módosításokat.\n"
+#~ "Biztosan folytatni akarja?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoll:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Ismeretlen"
+
+#~ msgid "_Personal Information"
+#~ msgstr "S_zemélyes információk"
+
+#~ msgid "Input level:"
+#~ msgstr "Bemeneti szint:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Bemeneti hangerő:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "Új csevegések megnyitása _külön ablakokban"
diff --git a/po/it.po b/po/it.po
index e603fb041..186239677 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,24 +1,23 @@
 # Italian translation for Empaty
-# Copyright (C) 2003-2010, 2011 The Free Software Foundation, Inc.
+# Copyright (C) 2003-2010, 2011, 2012 The Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empaty package.
 # Fabio Bonelli <fabiobonelli@libero.it>, 2003 
 # Michele Baldessari <michele@pupazzo.org>, 2003 
-# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011.
 # Luca Ferretti <lferrett@gnome.org>, 2011.
+# Milo Casagrande <milo@ubuntu.com>, 2007-2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-14 17:48+0000\n"
-"PO-Revision-Date: 2011-10-17 10:11+0200\n"
-"Last-Translator: Luca Ferretti <lferrett@gnome.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-03-13 21:46+0100\n"
+"PO-Revision-Date: 2012-03-12 22:11+0100\n"
+"Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
+"Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -38,27 +37,29 @@ msgstr "Messaggistica Internet Empathy"
 msgid "IM Client"
 msgstr "Messaggistica istantanea"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gestisce account di messaggistica e VoIP"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Account di messaggistica e VoIP"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "Apre sempre in una finestra separata le nuove conversazioni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Volume chiamata"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Volume della chiamata in percentuale."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "Device della videocamera"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "Posizione della videocamera"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -66,55 +67,61 @@ msgstr ""
 "Il carattere da usare dopo il soprannome quando viene usato il completamento "
 "del soprannome nelle conversazioni di gruppo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "Tema finestra di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "Variante del tema della finestra di conversazione"
 
 # (ndt) non metto fr neanche dopo morto! :D
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Elenco dizionari per il controllo ortografico, separare gli elementi con "
 "virgole (es. \"it, en, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "Elenco contatti compatto"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "Indica se deve essere usato il gestore delle connessioni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "Criterio di ordinamento dell'elenco contatti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Percorso oggetto D-Bus dell'ultimo account selezionato per entrere in una "
+"stanza."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Device della videocamera predefinito da usare, come /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "Directory predefinita da cui selezionare un'immagine per l'avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "Disabilita le notifiche quando assenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "Disabilita i suoni quando assenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "Visualizza gli eventi in arrivo nell'area di stato"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -122,280 +129,289 @@ msgstr ""
 "Visualizza gli eventi in arrivo nell'area di stato. Se FALSO, li mostra "
 "direttamente all'utente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "Supporto soppressione dell'eco"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr ""
 "Indica se il programma può pubblicare la posizione geografica dell'utente"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare il GPS per ipotizzare la posizione "
 "geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare la rete dei telefoni cellulari per "
 "ipotizzare la posizione geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr ""
 "Indica se il programma può utilizzare la rete per ipotizzare la posizione "
 "geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "Cartella predefinita per gli scaricamenti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr ""
-"Indica se il programma ha eseguito la migrazione dei registri di butterfly"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr ""
 "Indica se il programma deve impostare automaticamente lo stato di assenza "
 "quando inattivo"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "Indica se il programma deve connettersi automaticamente all'avvio"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr ""
 "Indica se il programma deve ridurre la precisione della posizione geografica"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Indica se il programma deve usare l'immagine del contatto come icona della "
 "finestra della conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "Abilita gli strumenti per sviluppatori di WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "Abilita le notifiche per i nuovi messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "Abilita il correttore ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "Nasconde la finestra principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "Nasconde la finestra principale."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "Informa gli altri utenti quando si sta digitando"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "L'ultimo account selezionato nella finestra \"Entra nella stanza\""
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr ""
+"Numero magico utilizzato per la verifica sull'esecuzione dell'attività di "
+"puluzia"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Nick completed character"
 msgstr "Carattere soprannome completato"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Open new chats in separate windows"
 msgstr "Apre nuove conversazioni in finestre separate"
 
 # (ndt) messo con la maiuscola, dovrebbe essere con la maiuscola il nome originale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use"
 msgstr "Percorso al tema di Adium da usare"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
 "Il percorso al tema di Adium da usare se il tema scelto per la conversazione "
 "è Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for incoming messages"
 msgstr "Emette un suono all'arrivo dei messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for new conversations"
 msgstr "Emette un suono per le nuove conversazioni"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound for outgoing messages"
 msgstr "Emette un suono all'invio dei messaggi"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs in"
 msgstr "Emette un suono quando un contatto si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when a contact logs out"
 msgstr "Emette un suono quando un contatto si scollega"
 
 # (ndt) per cercare di renderla impersonale
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log in"
 msgstr "Emette un suono quando l'utente locale si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Play a sound when we log out"
 msgstr "Emette un suono quando l'utente locale si scollega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Notifica se la conversazione non ha il focus"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs in"
 msgstr "Notifica quando un contatto si collega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Pop up notifications when a contact logs out"
 msgstr "Notifica quando un contatto si scollega"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Position the camera preview should be during a call."
 msgstr "La posizione dell'anteprima della videocamera durante una chiamata."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show Balance in contact list"
 msgstr "Mostra il saldo nell'elenco contatti"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show avatars"
 msgstr "Mostra gli avatar"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Show contact groups"
+msgstr "Mostra i gruppi dei contatti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show contact list in rooms"
 msgstr "Mostra l'elenco contatti nelle stanze di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show hint about closing the main window"
 msgstr "Mostra suggerimento riguardo la chiusura della finestra principale"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show offline contacts"
 msgstr "Mostra contatti fuori rete"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Show protocols"
 msgstr "Mostra i protocolli"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Spell checking languages"
 msgstr "Lingue controllo ortografico"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The default folder to save file transfers in."
 msgstr "La cartella predefinita in cui salvare i file ricevuti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The last directory that an avatar image was chosen from."
 msgstr "L'ultima directory da cui è stata scelta un'immagine per l'avatar."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The position for the chat window side pane"
 msgstr "La posizione del riquadro laterale della finestra di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr ""
 "Lo posizione (in pixel) salvata del riquadro laterale della finestra di "
 "conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr ""
 "Il tema usato per mostrare le conversazioni nelle finestre di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr ""
 "La variante del tema usato per mostrare le conversazioni nelle finestre di "
 "conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use graphical smileys"
 msgstr "Utilizza faccine grafiche"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use notification sounds"
 msgstr "Utilizza suoni per le notifiche"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Use theme for chat rooms"
 msgstr "Utilizza un tema per le stanze di conversazione"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr ""
 "Indica se il programma può pubblicare o meno la propria posizione geografica "
 "agli altri contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno il GPS per ipotizzare la posizione "
 "geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno la rete dei telefoni cellulari per "
 "ipotizzare la posizione geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy can use the network to guess the location."
 msgstr ""
 "Indica se il programma può usare o meno la rete per ipotizzare la posizione "
 "geografica."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Indica se il programma ha migrato o meno i registri di butterfly."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr ""
 "Indica se il programma deve collegarsi o meno automaticamente agli account "
 "all'avvio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
 "Indica se il programma deve impostare o meno automaticamente lo stato di "
 "assenza se l'utente è inattivo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Indica se il programma deve ridurre o meno la precisione della posizione "
 "geografica per motivi di privacy."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Indica se il programma deve usare o meno l'immagine del contatto come icona "
 "della finestra della conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Indica se gli strumenti per sviluppatori di WebKit, come \"Ispettore web\", "
 "debbano essere abilitati."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
@@ -403,76 +419,84 @@ msgstr ""
 "Indica se deve essere usato o meno il gestore della connessione per "
 "disconnettersi/connettersi automaticamente."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr ""
 "Indica se verificare o meno le parole digitate con le lingue selezionate."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr ""
 "Indica se convertire o meno le faccine in immagini grafiche durante le "
 "conversazioni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 "Indica se abilitare o meno il filtro di soppressione dell'eco di Pulseaudio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Indica se emettere o meno un suono quando i contatti si collegano alla rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Indica se emettere o meno un suono quando i contatti si scollegano dalla "
 "rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of events."
 msgstr "Indica se emettere o meno un suono per segnalare gli eventi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Indica se emettere o meno un suono all'arrivo dei messaggi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Indica se emettere o meno un suono per le nuove conversazioni."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Indica se emettere o meno un suono per l'invio dei messaggi."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging into a network."
 msgstr "Indica se emettere o meno un suono quando ci si collega in una rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Indica se emettere o meno un suono quando ci si scollega da una rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to play sound notifications when away or busy."
 msgstr ""
 "Indica se emettere o meno notifiche sonore quando si è assenti o non "
 "disponibili."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Indica se inviare gli stati \"composing\" o \"paused\" nella conversazione. "
+"Non modifica lo stato \"gone\"."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr ""
 "Indica se mostrare o meno una notifica quando un contatto va fuori rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr ""
 "Indica se mostrare o meno una notifica quando un contatto entra in rete."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -480,47 +504,51 @@ msgstr ""
 "Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio "
 "anche se la finestra di conversazione è già aperta, ma non ha il focus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr ""
 "Indica se mostrare o meno una notifica quando si riceve un nuovo messaggio."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show account balances in the contact list."
 msgstr "Indica se mostrare o meno il saldo dell'account nell'elenco contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr ""
 "Indica se mostrare o meno le immagini dei contatti nell'elenco contatti e "
 "nelle finestre di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr ""
 "Indica se mostrare o meno i contatti fuori rete nell'elenco dei contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether to show groups in the contact list."
+msgstr "Indica se mostrare o meno i gruppi nell'elenco contatti."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show popup notifications when away or busy."
 msgstr ""
 "Indica se mostrare o meno notifiche quando si è assenti o non disponibili."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr ""
 "Indica se mostrare o meno i protocolli per i contatti nell'elenco contatti."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in chat rooms."
 msgstr ""
 "Indica se mostrare o meno l'elenco contatti nelle stanze di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether to show the contact list in compact mode."
 msgstr "Indica se mostrare o meno l'elenco contatti in modalità compatta."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -528,47 +556,74 @@ msgstr ""
 "Indica se mostrare o meno un dialogo riguardo la chiusura della finestra "
 "principale con il pulsante \"x\" nella barra del titolo."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether to use the theme for chat rooms."
 msgstr "Indica se usare o meno un tema per le stanze di conversazione."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Indica quale criterio usare per l'ordinamento dell'elenco contatti. "
-"L'ordinamento predefinito è quello secondo il nome del contatto con il "
-"valore \"name\". Il valore \"state\" ordina in base allo stato del contatto."
+"L'ordinamento predefinito è quello secondo lo stato del contatto con un "
+"valore di \"state\". Il valore \"name\" ordina in base al nome."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gestisce account di messaggistica e VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+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."
+msgstr ""
+"empathy-sanity-cleaning.c utilizza questo numero per controllare se "
+"l'attività di pulizia deve essere eseguita o meno. Questa chiave non "
+"dovrebbe essere modificata."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Account di messaggistica e VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nessun motivo specificato"
+
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "È stata richiesta la modifica dello stato"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "È stato annullato il trasferimento del file"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "L'altro utente ha annullato il trasferimento del file"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Errore nel tentativo di trasferire il file"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "L'altro utente non è in grado di trasferire il file"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Motivo sconosciuto"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Trasferimento file completato, ma il file era danneggiato"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Il trasferimento di file non è supportato dal contatto remoto"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Il file selezionato non è un file regolare"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Il file selezionato è vuoto"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chiamata persa da %s"
@@ -585,172 +640,141 @@ msgstr "%s ha chiamato"
 msgid "Call from %s"
 msgstr "Chiamata da %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Tipo di socket non supportato"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nessun motivo specificato"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "È stata richiesta la modifica dello stato"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "È stato annullato il trasferimento del file"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "L'altro utente ha annullato il trasferimento del file"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Errore nel tentativo di trasferire il file"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "L'altro utente non è in grado di trasferire il file"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Motivo sconosciuto"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Non disponibile"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Assente"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Fuori rete"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nessun motivo specificato"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Lo stato è impostato a «Fuori rete»"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Errore di rete"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autenticazione non riuscita"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Errore di cifratura"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome in uso"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certificato non fornito"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificato non fidato"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certificato scaduto"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certificato non attivato"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Corrispondenza errata nel nome host del certificato"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Corrispondenza errata nell'impronta del certificato"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificato auto-firmato"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Errore nel certificato"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "La cifratura non è disponibile"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Il certificato non è valido"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "La connessione è stata rifiutata"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "La connessione non può essere stabilita"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "La connessione è stata persa"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Questa risorsa è già collegata al server"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Questo account è già collegato al server"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "La connessione è stata sostituita con una nuova che sfrutta la stessa risorsa"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "L'account esiste già sul server"
 
 # (ndt) rivedere too busy
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Il server è troppo carico per gestire la connessione"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Il certificato è stato revocato"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Il cifrario utilizzato dall'algoritmo del certificato non è sicuro o ha una "
 "cifratura debole"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -758,156 +782,148 @@ msgstr ""
 "La lunghezza del certificato o la profondità della catena del certificato "
 "del server supera i limiti imposti dalla libreria di cifratura"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Il software in uso è troppo datato"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Errore interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Persone nelle vicinanze"
 
 # (ndt) opzione
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Giappone"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Chat di Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d secondo fa"
 msgstr[1] "%d secondi fa"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto fa"
 msgstr[1] "%d minuti fa"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ora fa"
 msgstr[1] "%d ore fa"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d giorno fa"
 msgstr[1] "%d giorni fa"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d settimana fa"
 msgstr[1] "%d settimane fa"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mese fa"
 msgstr[1] "%d mesi fa"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "nel futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Password non trovata"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Password account messaggistica per %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Password per la stanza «%s» sull'account %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Tutti gli account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Account"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Password"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Account online"
-
-# (ndt) idee su dove/cosa sia My Web Accounts?
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "L'account %s viene modificato attraverso «%s»."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "L'account %s non può essere modificato utilizzando il programma."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Lancia «Account online»"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Modifica %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_pplica"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Acce_di"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Questo account esiste già sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Creare un nuovo account sul server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "A_nnulla"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s su %2$s"
@@ -915,12 +931,12 @@ msgstr "%1$s su %2$s"
 # (ndt) il %s pare sia il protocollo
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Account %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nuovo account"
 
@@ -969,7 +985,7 @@ msgstr "Ricordare la password"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "Ricordare la password"
 
@@ -1305,7 +1321,7 @@ msgid "STUN Server:"
 msgstr "Server STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "Server:"
 
@@ -1388,61 +1404,65 @@ msgstr "Tutti i file"
 msgid "Click to enlarge"
 msgstr "Clic per ingrandire"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Si è verificato un errore nell'iniziare la chiamata"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Il contatto specificato non supporta le chiamate"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Il contatto specificato è fuori rete"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Il contatto specificato non è valido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Le chiamate di emergenza non sono supportate su questo protocollo"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Non si dispone di credito sufficiente per effettuare questa chiamata"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Apertura della conversazione privata non riuscita"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Argomento non supportato in questa conversazione"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Non si è autorizzati a modificare l'argomento"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» non è un ID di contatto valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: pulisce tutti i messaggi dalla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <argomento>: imposta l'argomento per la conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID stanza>: entra in una nuova stanza"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1450,23 +1470,23 @@ msgstr ""
 "/part [<ID stanza>] [<motivo>]: esce dalla stanza, in modo predefinito "
 "quella attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID contatto> [<messaggio>]: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID contatto> <messaggio>: apre una conversazione privata"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <soprannome>: modifica il proprio soprannome sul server attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <messaggio>: invia un messaggio ACTION alla conversazione attuale"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1476,11 +1496,11 @@ msgstr ""
 "inviare un messaggio che inizia con «/». Per esempio: \"/say /join è usato "
 "per entrare in una nuova stanza\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID contatto>: visualizza informazioni riguardo un contatto"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1488,114 +1508,127 @@ msgstr ""
 "/help [<comando>]: mostra tutti i comandi supportati. Se <comando> è "
 "definito, ne mostra l'uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uso: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando sconosciuto. Provare /help per i comandi disponibili."
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "saldo non sufficiente per inviare messaggi"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Errore nell'inviare il messaggio «%s»: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Errore nell'inviare il messaggio: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "Saldo non sufficiente per inviare messaggi. <a href='%s'>Ricarica</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "non possibile"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "fuori rete"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "contatto non valido"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permesso negato"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "messaggio troppo lungo"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "non implementato"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Errore nell'inviare il messaggio «%s»: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Errore nell'inviare il messaggio: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Argomento:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Argomento impostato a: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Argomento impostato a «%2$s» da %1$s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Nessun argomento definito"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Nessun suggerimento)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Aggiungi «%s» al dizionario"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Aggiungi «%s» al dizionario %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Inserisci faccina"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Invia"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Suggerimenti ortografici"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Recupero dei registri recenti non riuscito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "L'utente %s si è disconnesso"
@@ -1603,13 +1636,13 @@ msgstr "L'utente %s si è disconnesso"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ha espulso %1$s"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "L'utente %s è stato espulso"
@@ -1617,19 +1650,19 @@ msgstr "L'utente %s è stato espulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ha bandito %1$s"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "L'utente %s è stato bandito"
 
 # (ndt) messa così per renderla asessuale
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "L'utente %s ha lasciato la stanza"
@@ -1639,19 +1672,19 @@ msgstr "L'utente %s ha lasciato la stanza"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 # (ndt) per renderla "asessuale"
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "L'utente %s è entrato nella stanza"
 
 # (ndt) per cercare di stare "asessuali"
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "L'utente %s è ora conosciuto come %s"
@@ -1660,91 +1693,91 @@ msgstr "L'utente %s è ora conosciuto come %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:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Disconnessi"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Salvare questa password?"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Ricorda"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Non ora"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Riprova"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Password errata. Provare nuovamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Questa stanza è protetta da una password:"
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Entra"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Connessi"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversazione"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Identificatore sconosciuto o non valido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blocco del contatto momentaneamente non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Blocco del contatto non disponibile"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Permesso negato"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Impossibile bloccare il contatto"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Modifica contatti bloccati"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1756,19 +1789,19 @@ msgstr "Contatti bloccati"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copia indirizzo collegamento"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Apri c_ollegamento"
@@ -1776,44 +1809,34 @@ msgstr "Apri c_ollegamento"
 # (ndt) domenica 01 ottobre 2007
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-# (ndt) titolo dialogo
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Modifica informazioni contatto"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informazioni personali"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nuovo contatto"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloccare %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Bloccare veramente «%s»? "
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blocca"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Segnalare abuso da questo contatto"
@@ -1833,352 +1856,267 @@ msgstr "Richiesta di approvazione"
 msgid "_Block User"
 msgstr "_Blocca utente"
 
-# (ndt) inteso come "contatti"
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Non raggruppati"
-
-# (ndt) inteso come "contatti"
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Preferiti"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Rimuovere veramente il gruppo «%s»?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Rimozione gruppo"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Rimuovi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Rimuovere veramente il contatto «%s»?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Rimozione contatto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "A_ggiungi contatto..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blocca contatto"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Conversazione"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "Chiamata _audio"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "Chiamata _video"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Conversazioni _precedenti"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Invia file"
-
-# (ndt) voce di menù
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Condividi desktop"
-
-# (ndt) dovrebbe essere relativo a un contatto
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Preferito"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Informa_zioni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Modifica"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Invito per questa stanza"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Invita nella stanza"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Cerca contatti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Cerca:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nessun contatto trovato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Un messaggio di presentazione:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Vorrei poter vedere quando sei online! Grazie!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Seleziona un contatto"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Numero di telefono:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Indirizzo email:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Sito web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Compleanno:"
-
-# (ndt) o "Ultimo avvistamento" :-)
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Ultima attività:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Connessione da:"
-
-# (ndt) usato lo stesso di xchat-gnome
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Messaggio di assenza:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Canali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Codice ISO del paese:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Stato:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Città:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Area:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Via:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Edificio:"
 
 # (ndt) questo è prima di una casella di testo
 # in cui inserire il criterio di ricerca
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Piano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Testo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Livello di precisione:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Errore:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Errore verticale (metri):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Errore orizzontale (metri):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Velocità:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Orientamento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Velocità di salita:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Ultimo aggiornamento:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitudine:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitudine:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitudine:"
 
 # (ndt) nome della scheda
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "Posizione geografica"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, il giorno %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%-d %B %Y alle %H.%M UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Salva immagine"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Impossibile salvare l'immagine"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Dettagli personali"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "Dettagli contatto"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Nome completo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Numero di telefono"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Indirizzo email"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Sito web"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Compleanno"
+
+# (ndt) o "Ultimo avvistamento" :-)
+#. 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 "Ultima attività:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Connessione da:"
+
+# (ndt) usato lo stesso di xchat-gnome
+#. 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 "Messaggio di assenza:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "lavoro"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "casa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "cellulare"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voce"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferito"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "postale"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "parcel"
+
 # (ndt) messo 'alla data' per problemi con le date che iniziano con 8 e 11
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
@@ -2186,7 +2124,7 @@ msgstr "<b>Posizione</b> alla data\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Pseudonimo:"
 
@@ -2198,15 +2136,10 @@ msgstr "Informazioni client"
 msgid "Client:"
 msgstr "Client:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Dettagli contatto"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identificatore:"
 
@@ -2224,11 +2157,11 @@ msgstr "SO:"
 msgid "Version:"
 msgstr "Versione:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Gruppi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2237,108 +2170,181 @@ msgstr ""
 "selezionarne più di uno oppure nessuno."
 
 # (ndt) pulsante
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "A_ggiungi gruppo"
 
 # (ndt) nome di una colonna
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selezione"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "La seguente identità verrà bloccata:"
 msgstr[1] "Le seguenti identità verranno bloccate:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "La seguente identità non può essere bloccata:"
 msgstr[1] "Le seguenti identità non possono essere bloccate:"
 
+# (ndt) titolo dialogo
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Modifica informazioni contatto"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Contatti uniti"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Selezionare i contatti da unire"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Anteprima nuovo contatto"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "I contatti selezionati nell'elenco a sinistra verranno uniti."
-
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 # (ndt) è un titolo...
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:345
 msgid "Select account to use to place the call"
 msgstr "Selezione account per la chiamata"
 
 # (ndt) è il titolo del dialogo
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:349
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "Chiamata"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:414
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "HOME"
 msgstr "Casa"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "_Blocca contatto"
+
+#. 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:16
+msgid "_Chat"
+msgstr "_Conversazione"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Chiamata _audio"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Chiamata _video"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "Conversazioni _precedenti"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "Invia file"
+
+# (ndt) voce di menù
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "Condividi desktop"
+
+# (ndt) dovrebbe essere relativo a un contatto
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Preferito"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+msgid "gnome-contacts not installed"
+msgstr "Il software «gnome-contacts» non è installato"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Installare «gnome-contacts» per accedere ai dettagli dei contatti."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "Informa_zioni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modifica"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Unisci contatti..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Invito per questa stanza"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "_Invita nella stanza"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "A_ggiungi contatto..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Elimina e _blocca"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Rimuovere veramente il gruppo «%s»?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Rimozione gruppo"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Rimuovi"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Rimuovere veramente il contatto «%s»?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2347,8 +2353,12 @@ msgstr ""
 "Rimuovere veramente il contatto unificato «%s»? Questa azione rimuoverà "
 "tutti i contatti di cui è composto."
 
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Rimozione contatto"
+
 # (ndt) rivedere meta-contact, trovare idee migliori...
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2364,20 +2374,20 @@ msgstr "<b>Posizione</b> alla data"
 msgid "Online from a phone or mobile device"
 msgstr "In rete da un telefono o dispositivo portatile"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nuova rete"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Scegliere una rete IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Ripristina ele_nco reti"
 
 #
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Seleziona"
@@ -2390,183 +2400,139 @@ msgstr "nuovo server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Unisci contatti"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Dividi..."
-
-# (ndt) suggerimento, tolto il punto
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Divide il contatto unificato visualizzato nei singoli contatti"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Unisci"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Dividere il contatto unificato «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Dividere veramente questo contatto unificato? In questo modo verrà diviso "
-"nei singoli contatti di cui è composto."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Dividi"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Cronologia"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostra"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Cerca"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversazione in %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversazione con %s"
 
 # (ndt) domenica 01 ottobre 2007
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %d %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s secondo"
 msgstr[1] "%s secondi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minuti"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Durata della chiamata: %s. Terminata alle: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Oggi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ieri"
 
 # (ndt) domenica 01 ottobre 2007
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%d %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Qualsiasi ora"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Chi"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Qualsiasi cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Testo conversazioni"
 
 # (ndt) è il titolo del dialogo
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "Chiamate"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Chiamate in arrivo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Chiamate in uscita"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Chiamate perse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Cosa"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Eliminare veramente tutte le registrazioni delle conversazioni precedenti?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Elimina tutto"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Elimina da:"
 
@@ -2595,7 +2561,7 @@ msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -2607,37 +2573,84 @@ msgstr "_File"
 msgid "page 2"
 msgstr "page 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ID contatto:"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Il contatto è fuori rete"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Conversazione"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Il contatto specificato non è valido o non è conosciuto"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Il contatto non supporta questo tipo di conversazione"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "La funzionalità richiesta non è implementata per questo protocollo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Impossibile iniziare una conversazione con il contatto fornito"
+
+# (ndt) messa così per renderle asessuale
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Impossibile accedere a questo canale (ban)"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Questo canale è pieno"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "È necessario essere invitati per entrare in questo canale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Impossibile continuare quando fuori rete"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permesso negato"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Si è verificato un errore nell'iniziare la conversazione"
+
+#: ../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 "Inserire un identificatore di contatto o un numero di telefono:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nuova conversazione"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Invia _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "Chiamata _video"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "C_hiama"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "Chiamata _audio"
 
 # (ndt) è il titolo del dialogo
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nuova chiamata"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Autenticazione non riuscita per l'account <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"
@@ -2675,13 +2688,8 @@ msgstr "Fare clic per aggiungere questo stato tra i preferiti"
 msgid "Set status"
 msgstr "Imposta lo stato"
 
-# (ndt) come c'è scritto nel codice: this string sucks
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Imposta la presenza e lo stato"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Messaggi personalizzati..."
 
@@ -2689,7 +2697,7 @@ msgstr "Messaggi personalizzati..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nuovo account %s"
@@ -2760,12 +2768,12 @@ msgid "Edit Custom Messages"
 msgstr "Modifica messaggi personalizzati"
 
 # (ndt) quello che c'è dopo è un timestamp, che ovviamente non è localizzabile...
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Messaggio modificato alle %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normale"
 
@@ -2845,35 +2853,39 @@ msgid "Certificate hostname: %s"
 msgstr "Nome host del certificato: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continua"
+msgid "C_ontinue"
+msgstr "C_ontinua"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Connessione non sicura"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Questa connessione non è sicura. Continuare in ogni caso?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Ricordare per le successive connessioni"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Dettagli certificato"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Impossibile aprire l'URI"
 
 # (ndt) titolo
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Seleziona un file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Spazio insufficiente per salvare il file"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2882,7 +2894,7 @@ msgstr ""
 "%s di spazio libero sono richiesti per salvare questo file, ma sono "
 "disponibili solamente %s. Scegliere un'altra posizione."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "File in arrivo da parte di %s"
@@ -3055,41 +3067,33 @@ msgstr "Occidentale"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Il contatto selezionato non può ricevere file."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Il contatto selezionato è fuori rete."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nessun messaggio di errore"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Messaggio istantaneo (Empathy)"
 
 # (ndt) opzione
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Non connettere all'avvio"
 
 # (ndt) opzione
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Non mostrare l'elenco contatti o qualsiasi altro dialogo all'avvio"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Messaggistica istantanea Empathy"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Errore nel contattare il gestore di account"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3135,245 +3139,96 @@ msgstr ""
 "questo programma. In caso contrario scrivere a: Free Software Foundation, "
 "Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Un client di messaggistica istantanea per GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Milo Casagrande <milo@ubuntu.com>\n"
 "Michele Baldessari\n"
 "Fabio Bonelli"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Si è verificato un errore durante l'importazione degli account."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr ""
-"Si è verificato un errore durante l'analisi dei dettagli degli account."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Si è verificato un errore durante la creazione dell'account."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Si è verificato un errore."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Il messaggio di errore è stato: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"È possibile tornare indietro e provare a inserire i dettagli degli account "
-"nuovamente oppure chiudere questo assistente e aggiungere gli account in un "
-"secondo momento dal menù «Modifica»."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Si è verificato un errore"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Che tipo di account è disponibile?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Sono disponibili altri account da configurare?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Inserire i dettagli dell'account"
-
-# (ndt) tolto chat volutamente
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Che tipo di account creare?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Creare altri account?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Inserire i dettagli del nuovo account"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Con Empathy è possibile conversare con le persone che ci circondano, con "
-"amici e colleghi che usano Google Talk, AIM, Windows Live e molti altri "
-"programmi di messaggistica. Con un microfono o una videocamera è anche "
-"possibile effettuare chiamate audio o video."
-
-# (ndt) non so perché si ostinano a usare chat...
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"È disponibile un account usato con un altro programma di messaggistica?"
-
-# (ndt) dopo di questa c'è un elenco a discesa...
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Sì, importare gli account da "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Sì, inserire i dettagli dell'account ora"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "No, creare un nuovo account"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "No, visualizzare solo le persone nelle vicinanze"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Selezionare gli account da importare:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Sì"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "No, per ora è tutto"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"È possibile scoprire e avere conversazioni automaticamente con le persone "
-"collegate sulla stessa rete in cui ci si trova. Per utilizzare questa "
-"caratteristica, assicurarsi che i dettagli sottostanti siano corretti. È "
-"comunque possibile modificare in seguito questi dettagli o disabilitare "
-"questa funzionalità attraverso il dialogo «Account»."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Modifica → Account"
-
-# (ndt) checkbutton
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "No_n abilitare ora questa funzionalità"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Non è possibile avere conversazioni con le persone collegate alla stessa "
-"rete locale poiché il pacchetto «telepathy-salut» non è installato. Per "
-"abilitare questa funzionalità, installare il pacchetto «telepathy-salut» e "
-"creare un account «Persone nelle vicinanze» attraverso il dialogo «Account»."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Il pacchetto «telepathy-salut» non è installato"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistente per account di messaggistica e VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Benvenuti in Empathy"
-
-# (ndt) titolo dialogo assistente
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importazione account"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Inserire i dettagli personali"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Sono presenti delle modifiche non salvate per l'account %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Il nuovo account non è ancora stato salvato."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Connessione..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Fuori rete — %s"
 
 # (ndt) plurale per comprendere uomini e donne
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Disconnessi — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Fuori rete — Nessuna connessione di rete"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Questo account è stato disabilitato poiché utiliza un backend datato e non "
+"supportato. Installare «telepathy-haze» e riavviare la sessione o migrare "
+"l'account."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Fuori rete — Account disabilitato"
 
-# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Sta per essere creato un nuovo account e le modifiche\n"
-"effettuate verranno scartate. Procedere veramente?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Modifica parametri connessione"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Impossibile recuperare le informazioni personali dal server."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Andare in rete per modificare le informazioni personali."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Modifica parametri connessione..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Rimuovere «%s» dal computer?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Questo non rimuoverà l'account dal server."
 
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3382,16 +3237,24 @@ msgstr ""
 "effettuate verranno scartate. Procedere veramente?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Abilita"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Disabilita"
 
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Salta"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Connetti"
+
 # (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3408,15 +3271,11 @@ msgid "Loading account information"
 msgstr "Caricamento informazioni account"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
+msgid "No protocol backends installed"
 msgstr "Nessun protocollo installato"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocollo:"
-
 # FIXME: backend, ci vuole di meglio
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3424,134 +3283,118 @@ msgstr ""
 "Per aggiungere un nuovo account è necessario installare un backend per ogni "
 "protocollo da usare."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_Importa..."
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - Client autenticazione Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Client autenticazione Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Persone nelle vicinanze"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Client audio/video Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Client audio/video Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contrasto"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Luminosità"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Barra laterale"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Ingresso audio"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Ingresso video"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Tastierino"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Dettagli"
 
 # (ndt) quello che c'è dopo è il nome del contatto
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Chiamata con %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "L'indirizzo IP visto dal computer"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "L'indirizzo IP visto da un server su Internet"
 
 # (ndt) il lato oscuro... questa è interessante e da rivedere
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "L'indirizzo IP del nodo visto dall'altro lato"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "L'indirizzo IP di un relay server"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "L'indirizzo IP del gruppo multicast"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Sconosciuto"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Sconosciuto"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Connessi — %d.%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Dettagli tecnici"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3560,8 +3403,8 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati audio "
 "supportati da questo computer"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3570,8 +3413,8 @@ msgstr ""
 "Il programma di %s non è in grado di comprendere alcuno dei formati video "
 "supportati da questo computer"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3580,27 +3423,27 @@ msgstr ""
 "Impossibile stabilire una connessione con %s. Si potrebbe essere collegati a "
 "una rete che non supporta connessioni dirette."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Si è verificato un problema sulla rete"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "I formati audio necessari per eseguire la chiamata non sono installati"
 
 # (ndt) eliminato volutamente il riferimento a computer
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "I formati video necessari per eseguire la chiamata non sono installati"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3611,23 +3454,23 @@ msgstr ""
 "\"%s\">Segnalare un problema</a> e allegare le informazioni raccolte "
 "attraverso l'azione «Debug» presente nel menù «Aiuto»."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Si è verificato un problema nel motore delle chiamate"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Raggiunta la fine del flusso"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Impossibile stabilire il flusso audio"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Impossibile stabilire il flusso video"
 
@@ -3723,8 +3566,8 @@ msgstr "Abilita/Disabilita la trasmissione video"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -3743,17 +3586,17 @@ msgid "_Camera"
 msgstr "Video_camera"
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "_Sommario"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "_Debug"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "A_iuto"
 
@@ -3766,51 +3609,98 @@ msgid "_Settings"
 msgstr "Imposta_zioni"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Chiudere la finestra?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Chiudendo questa finestra, il canale %s verrà abbandonato. Per ricevere "
+"nuovi messaggi, entrare nuovamente nel canale."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Chiudendo questa finestra verrà abbandonata una stanza di conversazione. Per "
+"ricevere nuovi messaggi, entrare nuovamente nella stanza."
+msgstr[1] ""
+"Chiudendo questa finestra verranno abbandonate %u stanze di conversazione. "
+"Per ricevere nuovi messaggi, entrare nuovamente nelle stanze."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Uscire da %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Per ricevere nuovi messaggi, entrare nuovamente nella stanza."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Chiudi finestra"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Lascia stanza"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d non letto)"
 msgstr[1] "%s (%d non letti)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e %u altro)"
 msgstr[1] "%s (e %u altri)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d non letto da altri)"
 msgstr[1] "%s (%d non letti da altri)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d non letto da tutti)"
 msgstr[1] "%s (%d non letti da tutti)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Invio di %d messaggio in corso"
 msgstr[1] "Invio di %d messaggi in corso"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Scrittura messaggio."
 
@@ -3893,98 +3783,98 @@ msgstr "Connessione automatica"
 msgid "Manage Favorite Rooms"
 msgstr "Gestione stanze preferite"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Chiamata video in arrivo"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s sta video-chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s sta chiamando, rispondere?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Chiamata in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Ri_fiuta"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Rispondi"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Rispondi con _video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Chiamata video in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Invito in una stanza"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s sta inviando un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Rifiuta"
 
 # (ndt) pulsante
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "C'è un invito per entrare in %2$s da parte di %1$s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "C'è un invito per entrare in %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Trasferimento file in arrivo da %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Password richiesta"
 
 # (ndt) so che non è impersonale... ma non mi viene niente di buono che sia impersonale...
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vorrebbe poter visualizzare la tua presenza in rete"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3994,105 +3884,105 @@ msgstr ""
 "Messaggio: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u.%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Sconosciuta"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s di %s a %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s di %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Ricezione del file «%s» da %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Invio del file «%s» a %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Errore nel ricevere il file «%s» da %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Errore nel ricevere un file"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Errore nell'inviare il file «%s» a %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Errore nell'inviare un file"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "File «%s» ricevuto da %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "File «%s» inviato a %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Attesa della risposta dell'altro utente"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verifica dell'integrità del file «%s»"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Calcolo codice di controllo di «%s»"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "File"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restante"
 
@@ -4107,7 +3997,12 @@ msgstr ""
 "Rimuove dall'elenco i trasferimenti di file completati, annullati e non "
 "riusciti"
 
-#: ../src/empathy-import-dialog.c:84
+# (ndt) nome di una colonna
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importa"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4116,185 +4011,212 @@ msgstr ""
 "importare gli account solamente da Pidgin."
 
 # (ndt) titolo
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importa account"
 
 # (ndt) nome di una colonna
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importa"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Sorgente"
 
 # (ndt) pare tooltip... mah...
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Fornisce password"
 
 # (ndt) tooltip
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Disconnette"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "È necessario configurare un account per poter visualizzare i contatti."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nessun risultato"
 
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"L'account «%s» non può essere utilizzato fino all'aggiornamento del software "
+"«%s»."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Aggiorna software..."
+
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Chiude"
+
+# (ndt) suggerimento
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Riconnette"
 
 # (ndt) suggerimento
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Modifica account"
 
-# (ndt) suggerimento
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Chiude"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Ricarica di %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Ricarica account"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Ricarica..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"È necessario abilitare uno degli account per poter visualizzare i contatti."
+
+#. 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 "È necessario abilitare «%s» per poter visualizzare i contatti."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Elenco contatti"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Impostazioni account"
+
 # (ndt) è una voce del menù visualizza
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "Contatti sulla _mappa"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "Saldo crediti"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "Trova in E_lenco contatti"
 
 # (ndt) voce di menù, stanze
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "Entra nelle pre_ferite"
 
 # (ndt) stanze
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "Gestisci preferite"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "Dimensione nor_male"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "Nuova c_hiamata..."
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "Dimensione normale con imm_agini"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "Preferen_ze"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Mostrare p_rotocolli"
 
 # (ndt) opzione - pulsante radio
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "Ordinare per _nome"
 
 # (ndt) opzione - pulsante radio
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "Ordinare per s_tato"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Account"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "Contatti _bloccati"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "_Dimensione ridotta"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "Trasferimenti _file"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "_Entra..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_Nuova conversazione..."
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "C_ontatti fuori rete"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Informazioni _personali"
-
 # (ndt) voce di menù per accedere alle opzioni relative ai canali IRC
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "St_anza"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_Cerca contatti..."
 
 # (ndt) pare il titolo di una colonna
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Stanza"
 
 # (ndt) titolo scheda
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membri"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4307,16 +4229,21 @@ msgstr ""
 "Password richiesta: %s\n"
 "Membri: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sì"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "No"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Impossibile recuperare l'elenco delle stanze"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Impossibile bloccare il recupero dell'elenco delle stanze"
 
@@ -4353,79 +4280,79 @@ msgstr "Stan_za:"
 
 # (ndt) quelli che seguono sono
 # messaggi di eventi a cui associare un suono
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nuova conversazione"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Il contatto entra in rete"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Il contatto va fuori rete"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Account connesso"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Account disconnesso"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Lingua"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Giulietta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, perché sei tu Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Rinnega tuo padre e rifiuta il tuo nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "o, se non vuoi, legati solo in giuramento all'amor mio"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "e io non sarò più una Capuleti."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Starò ancora ad ascoltare, o rispondo a questo che ha detto?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "L'utente Giulietta si è disconnesso"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferenze"
 
@@ -4489,37 +4416,29 @@ msgstr "Abilitare il controllo ortografico per le lingue:"
 msgid "General"
 msgstr "Generale"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Livello di ingresso:"
-
-#: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Volume di ingresso:"
-
 # (ndt) nome di una sezione
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid "Location sources:"
 msgstr "Sorgenti per la posizione:"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "Registrare le conversazioni"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "Riprodurre un suono per gli eventi"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4530,26 +4449,30 @@ msgstr ""
 "precisione delle coordinate GPS sarà di una posizione decimale."
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "Mostrare le faccin_e come immagini"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "Mostrare l'e_lenco contatti nelle stanze"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Suoni"
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "Controllo ortografico"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "Avvia conversazioni in:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4558,61 +4481,64 @@ msgstr ""
 "installato."
 
 # (ndt) titolo scheda
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "Temi"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr ""
 "Usare la soppressione dell'_eco per migliorare la qualità della chiamata"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "Variante:"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "C_onnettere automaticamente all'avvio"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "C_ellulare"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "Abilitar_e le notifiche visive"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "Abilitar_e le notifiche sonore"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Rete (IP, WiFi)"
 
 # (ndt) opzione
-#: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "A_prire finestre separate per le nuove conversazioni"
-
-# (ndt) opzione
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "_Pubblicare la posizione geografica ai propri contatti"
 
 #. 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:41
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "_Ridurre la precisione della posizione geografica"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "nuove _finestre"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "nuove _schede"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "Stato"
@@ -4674,67 +4600,88 @@ msgid "Video Preview"
 msgstr "Anteprima"
 
 # (ndt) questo è il titolo della finestra che mostra la mappa... molto libera
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Mappa posizioni dei contatti"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Salva"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Collegamento Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Risposta Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Troppi dati per una singola operazione. Salvare i registri su file."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Invia a Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Livello "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informazioni"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Avviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Critico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Errore"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Orario"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Livello"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4742,26 +4689,26 @@ msgstr ""
 "Il gestore di connessione selezionato non sembra supportare l'estensione per "
 "il debug remoto."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Invita partecipante"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Scegliere un contatto da invitare nella conversazione:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Invita"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Non visualizza alcun dialogo, esegue qualsiasi operazione (come "
 "l'importazione) ed esce"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
@@ -4769,104 +4716,415 @@ msgstr ""
 "vicinanze\""
 
 # (ndt) spero che una cosa così non si veda mai...
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Seleziona l'account fornito (per esempio gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Account Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Account Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Mostra un servizio particolare"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Debugger Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Debugger Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Client chat Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rifiuta"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Rispondi"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Rispondi con video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Declina"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Accetta"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Fornisce"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ha appena cercato di chiamare, ma era in corso un'altra chiamata."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "In attesa"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Muto"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Durata"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d.%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Il saldo attuale è di %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Saldo non sufficiente per effettuare la chiamata."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Ricarica"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Maiuscole/minuscole"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Che tipo di account è disponibile?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Aggiunta nuovo account"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Persone nelle vicinanze"
+
+#: ../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."
+msgstr ""
+"È possibile scoprire e avere conversazioni automaticamente con le persone "
+"collegate sulla stessa rete in cui ci si trova. Per utilizzare questa "
+"funzionalità, assicurarsi che i dettagli sottostanti siano corretti."
+
+#: ../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 ""
+"La modifica dei dettagli può essere effettuata anche in un secondo momento o "
+"è possibile disabilitare questa funzionalità scegliendo <span style=\"italic"
+"\">Modifica → Account</span> dall'elenco dei contatti."
+
+#~ msgid "Call volume"
+#~ msgstr "Volume chiamata"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Volume della chiamata in percentuale."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr ""
+#~ "Indica se il programma ha eseguito la migrazione dei registri di butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Indica se il programma ha migrato o meno i registri di butterfly."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Tipo di socket non supportato"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Account online"
+
+# (ndt) idee su dove/cosa sia My Web Accounts?
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "L'account %s viene modificato attraverso «%s»."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "L'account %s non può essere modificato utilizzando il programma."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Lancia «Account online»"
+
+#~ msgid "Edit %s"
+#~ msgstr "Modifica %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "A_nnulla"
+
+#~ msgid "Personal Information"
+#~ msgstr "Informazioni personali"
+
+# (ndt) inteso come "contatti"
+#~ msgid "Ungrouped"
+#~ msgstr "Non raggruppati"
+
+# (ndt) inteso come "contatti"
+#~ msgid "Favorite People"
+#~ msgstr "Preferiti"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Modifica"
+
+#~ msgid "Select a contact"
+#~ msgstr "Seleziona un contatto"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Selezionare i contatti da unire"
+
+#~ msgid "New contact preview"
+#~ msgstr "Anteprima nuovo contatto"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "I contatti selezionati nell'elenco a sinistra verranno uniti."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Unisci contatti..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Unisci contatti"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Dividi..."
+
+# (ndt) suggerimento, tolto il punto
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Divide il contatto unificato visualizzato nei singoli contatti"
+
+#~ msgid "_Link"
+#~ msgstr "_Unisci"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Dividere il contatto unificato «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Dividere veramente questo contatto unificato? In questo modo verrà diviso "
+#~ "nei singoli contatti di cui è composto."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Dividi"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ID contatto:"
+
+#~ msgid "C_hat"
+#~ msgstr "_Conversazione"
+
+#~ msgid "Send _Video"
+#~ msgstr "Invia _video"
+
+#~ msgid "C_all"
+#~ msgstr "C_hiama"
+
+# (ndt) come c'è scritto nel codice: this string sucks
+#~ msgid "Set your presence and current status"
+#~ msgstr "Imposta la presenza e lo stato"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Il contatto selezionato non può ricevere file."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Il contatto selezionato è fuori rete."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Si è verificato un errore durante l'importazione degli account."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr ""
+#~ "Si è verificato un errore durante l'analisi dei dettagli degli account."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Si è verificato un errore durante la creazione dell'account."
+
+#~ msgid "There was an error."
+#~ msgstr "Si è verificato un errore."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Il messaggio di errore è stato: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "È possibile tornare indietro e provare a inserire i dettagli degli "
+#~ "account nuovamente oppure chiudere questo assistente e aggiungere gli "
+#~ "account in un secondo momento dal menù «Modifica»."
+
+#~ msgid "An error occurred"
+#~ msgstr "Si è verificato un errore"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Sono disponibili altri account da configurare?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Inserire i dettagli dell'account"
+
+# (ndt) tolto chat volutamente
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Che tipo di account creare?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Creare altri account?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Inserire i dettagli del nuovo account"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Con Empathy è possibile conversare con le persone che ci circondano, con "
+#~ "amici e colleghi che usano Google Talk, AIM, Windows Live e molti altri "
+#~ "programmi di messaggistica. Con un microfono o una videocamera è anche "
+#~ "possibile effettuare chiamate audio o video."
+
+# (ndt) non so perché si ostinano a usare chat...
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "È disponibile un account usato con un altro programma di messaggistica?"
+
+# (ndt) dopo di questa c'è un elenco a discesa...
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sì, importare gli account da "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sì, inserire i dettagli dell'account ora"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "No, creare un nuovo account"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "No, visualizzare solo le persone nelle vicinanze"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Selezionare gli account da importare:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "No, per ora è tutto"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Modifica → Account"
+
+# (ndt) checkbutton
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "No_n abilitare ora questa funzionalità"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Non è possibile avere conversazioni con le persone collegate alla stessa "
+#~ "rete locale poiché il pacchetto «telepathy-salut» non è installato. Per "
+#~ "abilitare questa funzionalità, installare il pacchetto «telepathy-salut» "
+#~ "e creare un account «Persone nelle vicinanze» attraverso il dialogo "
+#~ "«Account»."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Assistente per account di messaggistica e VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Benvenuti in Empathy"
+
+# (ndt) titolo dialogo assistente
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importazione account"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Inserire i dettagli personali"
+
+# (ndt) messo scartate perché il pulsante nella finestra è "Scarta"
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Sta per essere creato un nuovo account e le modifiche\n"
+#~ "effettuate verranno scartate. Procedere veramente?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protocollo:"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Sconosciuto"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Informazioni _personali"
+
+#~ msgid "Input level:"
+#~ msgstr "Livello di ingresso:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Volume di ingresso:"
+
+# (ndt) opzione
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "A_prire finestre separate per le nuove conversazioni"
diff --git a/po/ja.po b/po/ja.po
index 6da82ec74..51752cf95 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,5 +1,5 @@
 # empathy ja.po.
-# Copyright (C) 2007-2011 empathy's COPYRIGHT HOLDER
+# Copyright (C) 2007-2012 empathy's COPYRIGHT HOLDER
 # This file is distributed under the same license as the empathy package.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2007-2009.
 # Kentaro Kazuhama <kazken3@gmail.com>, 2009.
@@ -7,26 +7,41 @@
 # (Contributed to Moblin by Intel GLS)
 # Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2010.
 # Kiyotaka NISHIBORI <ml.nishibori.kiyotaka@gmail.com>, 2010.
+# Mako N <mako@pasero.net>, 2012.
 #
 # GLOSSARIES:
-#  contact list: 仲間リスト
-#  contact:      仲間
-#  away:         離席
-#  log(s) in:    サインイン
-#  log(s) out:   サインアウト
-#  chat room:    チャット部屋
-#  chat window:  チャットウィンドウ
-#  nick:         ニックネーム
-#  nickname:     ニックネーム
+# call	通話、呼び出し、呼び出す
+# choose	選ぶ
+# select	指定する
+# contact	相手先
+# contact list	相手先の一覧
+# metacontact	メタ相手先
+# chat	チャット
+# conversation	会話
+# chat room	談話室
+# room	談話室
+# text	文字
+# audio	音声
+# video	ビデオ、映像
+# identifier	名称
+# status	在席状況
+# People Nearby	(訳さない)
+# geolocation	位置情報
+# location	場所
+#
+# nick:    ニックネーム
+# nickname:   ニックネーム
+# log(s) in:    サインイン
+# log(s) out:   サインアウト
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-16 12:29+0000\n"
-"PO-Revision-Date: 2011-09-11 00:28+0900\n"
-"Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
+"POT-Creation-Date: 2012-02-08 14:20+0000\n"
+"PO-Revision-Date: 2012-02-08 20:43+0900\n"
+"Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,698 +50,680 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Googleトーク、Facebook、MSN や他の多くのチャットサービスでチャット"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "インスタントメッセンジャー・クライアント"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Empathy インスタント・メッセンジャー"
+msgstr "Empathy インスタントメッセージング"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "インスタント・メッセンジャー クライアント"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Googleトーク、Facebook、MSN や他の多くのチャットサービスでチャット"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "新しいチャット用に別のチャットウィンドウを常に開きます。"
+msgid "Connection managers should be used"
+msgstr "接続マネージャーを利用するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr ""
+"自動的に切断/再接続するのに接続マネージャーを利用すべきかどうかを設定します。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr ""
+msgid "Empathy should auto-connect on startup"
+msgstr "起動時に自動接続するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Camera On"
-msgid "Camera device"
-msgstr "カメラ入"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Empathy を起動したら自動的に自分のアカウントにサインインするかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-#, fuzzy
-#| msgid "Camera On"
-msgid "Camera position"
-msgstr "カメラ入"
+msgid "Empathy should auto-away when idle"
+msgstr "アイドル時に自動的に離席中にするかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"グループ・チャットでニックネームを補完(tab)した際に、ニックネームの後ろに追加"
-"する文字です。"
+"ユーザーがアイドル状態になったら、Empathy が自動的に離席中のモードにするかど"
+"うかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "チャットウィンドウのテーマ"
+msgid "Empathy default download folder"
+msgstr "Empathy が使うデフォルトのダウンロード・フォルダー"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-#, fuzzy
-#| msgid "Chat window theme"
-msgid "Chat window theme variant"
-msgstr "チャットウィンドウのテーマ"
+msgid "The default folder to save file transfers in."
+msgstr "転送したファイルを保存するデフォルトのフォルダーです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"スペルをチェックする言語をコンマで区切って指定します (例: \"en, fr, nl\")。"
+msgid "Show offline contacts"
+msgstr "オフラインの相手先を表示するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "仲間リストを小さくするかどうか"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "相手先の一覧の中でオフラインの相手先を表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "接続マネージャーを利用するかどうか"
+msgid "Show avatars"
+msgstr "アバターを表示するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "仲間リストを並び替える際の条件"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"相手先の一覧とチャットウィンドウの中に相手先のアバターを表示するかどうかで"
+"す。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
+msgid "Show protocols"
+msgstr "プロトコルを表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "アバターの画像が格納されたデフォルトのフォルダー"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "相手先の一覧の中の相手先にプロトコルを表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "離席中になってもポップアップ通知しないかどうか"
+#, fuzzy
+msgid "Show Balance in contact list"
+msgstr "相手先の一覧をコンパクトにする(_M)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "離席中になったらサウンドの演奏を無効にするかどうか"
+#, fuzzy
+msgid "Whether to show account balances in the contact list."
+msgstr "相手先の一覧の中の相手先にプロトコルを表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "受信したイベントを表示"
+msgid "Compact contact list"
+msgstr "相手先の一覧を小さくするかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"受信したイベントを通知領域に表示します。もし false なら、ユーザーにすぐに通知"
-"します。"
+msgid "Whether to show the contact list in compact mode."
+msgstr "相手先の一覧を小さく表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr ""
+msgid "Hide main window"
+msgstr "メインウィンドウを隠すかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathyでユーザーの場所の公開を可能にする"
+msgid "Hide the main window."
+msgstr "メインウィンドウを隠すかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathyで場所の推測にGPSを利用することを可能にする"
+msgid "Default directory to select an avatar image from"
+msgstr "アバターの画像が格納されたデフォルトのフォルダー"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathyで場所の推測にセルラーネットワークを利用することを可能にする"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "最後にアバターを選択した時に使用したフォルダーです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathyで場所の推測にネットワークを利用することを可能にする"
+msgid "Open new chats in separate windows"
+msgstr "新しいチャットごとにウィンドウを開くかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy が使うデフォルトのダウンロード・フォルダー"
+msgid "Always open a separate chat window for new chats."
+msgstr "常に新しいチャットごとに別のチャットウィンドウを開きます。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy は butterfly のログを移行しました"
+msgid "Display incoming events in the status area"
+msgstr "受信したイベントを表示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "アイドル時に自動的に離席するかどうか"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"受信したイベントを通知領域に表示します。もし false なら、ユーザーにすぐに通知"
+"します。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "起動時に自動接続するかどうか"
+msgid "The position for the chat window side pane"
+msgstr "チャットウィンドウの横のペインの位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathyは場所の精度を下げるかどうか"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "保存されたチャットウィンドウの横のペインの位置 (ピクセル単位)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "仲間リストのアバターをチャットウィンドウのアイコンにするかどうか"
+msgid "Contact list sort criterion"
+msgstr "相手先の一覧を並び替える際の条件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit Developer Toolsを有効にする"
+#, fuzzy
+#| 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 ""
+"相手先の一覧の中で相手先を並び替える際にどの条件を使用するか。デフォルトは相"
+"手先の名前 (\"name\") です。\"state\" だと相手先の状態で相手先の一覧を並び替"
+"えます。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "メッセージを受信したらポップアップで通知するかどうか"
+msgid "Use notification sounds"
+msgstr "通知のサウンドを使うかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "スペルをチェックするかどうか"
+msgid "Whether to play a sound to notify of events."
+msgstr "イベントが発生したらサウンドを再生して通知するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "メイン・ウィンドウを隠すかどうか"
+msgid "Disable sounds when away"
+msgstr "離席中のときはサウンドを鳴らさない"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "メイン・ウィンドウを隠すかどうかです。"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "離席中または取り込み中のとき、サウンド通知を行うかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "ニックを補完する文字"
+msgid "Play a sound for incoming messages"
+msgstr "メッセージを受信したらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "新しい会話毎にウィンドウを開くかどうか"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "メッセージを受け取ったらサウンドを再生して通知するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "使用する Adium テーマのパス"
+msgid "Play a sound for outgoing messages"
+msgstr "メッセージを送信したらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"会話で使用するテーマが Adium の場合に使用する Adium テーマのパスを指定しま"
-"す。"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "メッセージを送信したらサウンドを再生して通知するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "メッセージを受信したらサウンドを演奏するかどうか"
+msgid "Play a sound for new conversations"
+msgstr "チャットで新しい会話をしたらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "チャットで新しい会話をしたらサウンドを演奏するかどうか"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "新しい会話を開始したらサウンドを再生して通知するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "メッセージを送信したらサウンドを演奏するかどうか"
+msgid "Play a sound when a contact logs in"
+msgstr "相手先がサインインしたらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "仲間がサインインしたらサウンドを演奏するかどうか"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"相手先がサインインしたことを通知するためにサウンドを再生するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
-msgstr "仲間がサインアウトしたらサウンドを演奏するかどうか"
+msgstr "相手先がサインアウトしたらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "サインインしたらサウンドを演奏するかどうか"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"相手先がサインアウトしたことを通知するためにサウンドを再生するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "サインアウトしたらサウンドを演奏するかどうか"
+msgid "Play a sound when we log in"
+msgstr "サインインしたらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr ""
-"チャット・ウィンドウにフォーカスが当たっていない場合にポップアップ通知する"
+msgid "Whether to play a sound when logging into a network."
+msgstr "ネットワークにサインインしたらサウンドを再生するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "仲間がサインインした際にポップアップ通知"
+msgid "Play a sound when we log out"
+msgstr "サインアウトしたらサウンドを鳴らすかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "仲間がサインアウトした際にポップアップ通知"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ネットワークからサインアウトしたらサウンドを再生するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr ""
+msgid "Enable popup notifications for new messages"
+msgstr "メッセージを受信したらポップアップで通知するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-#, fuzzy
-#| msgid "Show co_mpact contact list"
-msgid "Show Balance in contact list"
-msgstr "仲間リストをコンパクトにする(_M)"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "新しいメッセージを受信する際に、ポップアップ通知するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "アバターを表示するかどうか"
+msgid "Disable popup notifications when away"
+msgstr "離席中のときはポップアップ通知しない"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "部屋に仲間の一覧を表示するかどうか"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "離席中または取り込み中のとき、ポップアップ通知を表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "メイン・ウィンドウを閉じる際のヒントを表示するかどうか"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr ""
+"チャットウィンドウにフォーカスが当たっていない場合にポップアップ通知する"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "オフラインな仲間を表示するかどうか"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"チャットウィンドウが開いていてもフォーカスが当たっていない場合、新しいメッ"
+"セージを受信する際にポップアップ通知を行うかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "プロトコルを表示"
+msgid "Pop up notifications when a contact logs in"
+msgstr "相手先がサインインした際にポップアップ通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "スペルをチェックする言語"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "相手先がオンラインになった際にポップアップ通知を表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "転送したファイルを保存するデフォルトのフォルダーです。"
+msgid "Pop up notifications when a contact logs out"
+msgstr "相手先がサインアウトした際にポップアップ通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "最後にアバターを選択した時に使用したフォルダーです。"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "相手先がオフラインになった際にポップアップ通知を表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "チャットウィンドウの横のペインの位置"
+msgid "Use graphical smileys"
+msgstr "スマイリー・アイコンを使うかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "保存されたチャットウィンドウの横のペインの位置 (ピクセル単位)"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "会話中のスマイリーをグラフィカルな画像に変換するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "チャットウィンドウで使用するテーマです。"
+msgid "Show contact list in rooms"
+msgstr "談話室に相手先の一覧を表示するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "チャットウィンドウで使用するテーマです。"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "談話室で相手先の一覧を表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "スマイリー・アイコンを使うかどうか"
+msgid "Chat window theme"
+msgstr "チャットウィンドウのテーマ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "状態をサウンドの演奏で通知するかどうか"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "チャットウィンドウで使用するテーマです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "チャットルームにテーマを適用するかどうか"
+#, fuzzy
+msgid "Chat window theme variant"
+msgstr "チャットウィンドウのテーマ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathyが仲間に場所を公開するかどうかを設定します。"
+#, fuzzy
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "チャットウィンドウで使用するテーマです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "EmpathyがGPSで場所を推測するかどうかを設定します。"
+msgid "Path of the Adium theme to use"
+msgstr "使用する Adium テーマのパス"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathyがセルラーネットワークで場所を推測するかどうかを設定します。"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"チャットで使用するテーマが Adium の場合に使用する Adium テーマのパスを指定し"
+"ます。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathyがネットワークで場所を推測するかどうかを設定します。"
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit Developer Tools を有効にする"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy が butterfly のログを移行したかどうか。"
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Web Inspector のような WebKit developer tools を有効にするかどうか。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Empathy を起動したら自動的に自分のアカウントにサインインするかどうかです。"
+msgid "Use theme for chat rooms"
+msgstr "談話室にテーマを適用するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "アイドル状態になったら、Empathy が自動的に離席するかどうかです。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "談話室でテーマを使用するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Empathyがプライバシーの理由で場所の精度を下げるかどうかを設定します。"
+msgid "Spell checking languages"
+msgstr "スペルをチェックする言語"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Empathy が仲間のアバターをチャットウィンドウのアイコンとして利用するかどうか"
-"です。"
+"スペルをチェックする言語をコンマで区切って指定します (例: \"en, fr, nl\")。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Web InspectorのようなWebKit developer toolsを有効にするかどうか。"
+msgid "Enable spell checker"
+msgstr "スペルをチェックするかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"自動的に切断/再接続するのに接続マネージャーを利用すべきかどうかを設定します。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "指定した言語で入力した単語をチェックするかどうかです。"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "ニックネームを補完する文字"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "会話中のスマイリーをグラフィカルな画像に変換するかどうかです。"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"グループチャットでニックネームを補完(tab)した際に、ニックネームの後ろに追加す"
+"る文字です。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr ""
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "相手先の一覧のアバターをチャットウィンドウのアイコンにするかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
-"仲間がサインインしたことを通知するためにサウンドを再生するかどうかです。"
+"Empathy が相手先のアバターをチャットウィンドウのアイコンとして利用するかどう"
+"かです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
+msgid "Last account selected in Join Room dialog"
 msgstr ""
-"仲間がサインアウトしたことを通知するためにサウンドを再生するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "イベントが発生したらサウンドを再生して通知するかどうかです。"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "メッセージを受け取ったらサウンドを再生して通知するかどうかです。"
+msgid "Camera device"
+msgstr "カメラデバイス"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "新しい会話を開始したらサウンドを再生して通知するかどうかです。"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ビデオ通話に使用するデフォルトのカメラデバイス。たとえば /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "メッセージを送信したらサウンドを再生して通知するかどうかです。"
+msgid "Camera position"
+msgstr "カメラの位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "ネットワークにサインインしたらサウンドを再生するかどうかです。"
+msgid "Position the camera preview should be during a call."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ネットワークからサインアウトしたらサウンドを再生するかどうかです。"
+msgid "Echo cancellation support"
+msgstr "エコー除去のサポート"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "離席中または多忙になったらサウンドの再生による通知を行うかどうかです。"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio のエコー除去フィルターを有効にするかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"仲間がオフラインになった際にポップアップでの通知を表示するかどうかです。"
+msgid "Show hint about closing the main window"
+msgstr "メインウィンドウを閉じる際のヒントを表示するかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"仲間がオンラインになった際にポップアップでの通知を表示するかどうかです。"
+"タイトルバーにある 'x' ボタンをクリックしてメインウィンドウを閉じたらメッセー"
+"ジ・ダイアログを表示するかどうかです。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"チャット・ウィンドウが開いていてもフォーカスが当たっていなければ、新しいメッ"
-"セージを受信する度にポップアップ通知を行うかどうかです。"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy でユーザーの場所の公開を可能にする"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "新しいメッセージを受信する度にポップアップ通知するかどうかです。"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy が相手先に場所を公開するかどうかを設定します。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-#, fuzzy
-#| msgid "Whether to show protocols for contacts in the contact list."
-msgid "Whether to show account balances in the contact list."
-msgstr "仲間リストの中の仲間にプロトコルを表示するかどうかです。"
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy で場所の推測にネットワークを利用することを可能にする"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"仲間リストとチャットウィンドウの中に仲間のアバターを表示するかどうかです。"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy がネットワークで場所を推測するかどうかを設定します。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "仲間リストの中でオフラインの仲間を表示するかどうかです。"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy で場所の推測にセルラーネットワークを利用することを可能にする"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"状態が離席中または多忙になってもポップアップ通知を表示するかどうかです。"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy がセルラーネットワークで場所を推測するかどうかを設定します。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "仲間リストの中の仲間にプロトコルを表示するかどうかです。"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy で場所の推測に GPS を利用することを可能にする"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "チャットルームで仲間リストを表示するかどうかです。"
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy が GPS で場所を推測するかどうかを設定します。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "仲間リストを小さく表示するかどうかです。"
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy は場所の精度を下げるかどうか"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"タイトルバーにある 'x' ボタンをクリックしてメインウィンドウを閉じたらメッセー"
-"ジ・ダイアログを表示するかどうかです。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "チャットルームでテーマを使用するかどうかです。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-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."
-msgstr ""
-"仲間リストの中で仲間を並び替える際にどの条件を使用するか。デフォルトは仲間の"
-"名前 (\"name\") です。\"state\" だと仲間の状態で仲間リストを並び替えます。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy がプライバシーの理由で場所の精度を下げるかどうかを設定します。"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "メッセージングと VoIP のアカウント"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "メッセージングと VoIP のアカウントの管理"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "メッセージングと VoIP のアカウント"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "原因が特定されていません"
 
-#: ../libempathy/empathy-ft-handler.c:825
-#, fuzzy
-#| msgid "File transfer completed"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "状態の変更を要求されました"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "ファイル転送をキャンセルしました"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "他の相手先がファイル転送をキャンセルしました"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "ファイルの転送中にエラーが発生しました"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "他の相手先がファイル転送できませんでした"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "原因不明です"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
-msgstr "ファイルの転送が完了しました"
+msgstr "ファイルの転送が完了しました。しかしファイルは壊れています"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "リモート側の相手はファイル転送をサポートしていません。"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "選択したファイルは一般的なファイルではありません"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "選択されたファイルは空です"
 
 #: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Missed call from %s"
-msgstr "%s さんからの呼び出しです"
+msgstr "%s さんからの失敗した通話"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
 #: ../libempathy/empathy-message.c:419
 #, fuzzy, c-format
-#| msgid "Call with %s"
 msgid "Called %s"
-msgstr "%sで発信"
+msgstr "%s さんへの通話"
 
 #: ../libempathy/empathy-message.c:422
-#, fuzzy, c-format
-#| msgid "Incoming call from %s"
+#, c-format
 msgid "Call from %s"
-msgstr "%s さんからの呼び出しです"
-
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "サポートされていないソケットタイプです"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "原因が特定されていません"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "状態の変更を要求されました"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "ファイル転送をキャンセルしました"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "他の仲間がファイル転送をキャンセルしました"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "ファイルの転送中にエラーが発生しました"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "他の仲間がファイル転送できませんでした"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "原因不明です"
+msgstr "%s さんからの通話"
 
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在席中"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "取り込み中"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離席中"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
-msgstr "非表示"
+msgstr "隠れ中"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "オフライン"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
-#, fuzzy
-#| msgid "Unknown"
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "原因が特定されていません"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
-msgstr "状態はオフラインに設定されています"
+msgstr "在席状況はオフラインに設定されています"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "ネットワークのエラーです"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "暗号化のエラーです"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "使用中の名前"
+msgstr "名前は使用中です"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "証明書がありません"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "信用のない証明書です"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "証明書の有効期限が切れています"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "証明書は利用できません"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "証明書のホスト名が一致しません"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "証明書の指紋が一致しません"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "証明書自身の署名です"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "証明書に関連するエラーです"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "暗号が利用できません"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "証明書が正しくありません"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "接続が拒否されました"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "接続を確立できませんでした"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "接続が失われました"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "このリソースは既にサーバーに接続済みです"
+#: ../libempathy/empathy-utils.c:355
+#, fuzzy
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "このリソースはすでにサーバーに接続済みです"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "接続は同じリソースを使って新しい接続で置き換わりました"
+msgstr "接続は同じリソースを使う新しい接続で置き換わりました"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
-msgstr "アカウントがサーバーに既に存在しています"
+msgstr "アカウントがサーバーにすでに存在しています"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "サーバーがこの接続を処理できないくらいに忙しい状態にあります"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "証明書が無効化されました"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "証明書が安全でない暗号のアルゴリズムを使っているか、暗号的に弱いです"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -734,288 +731,260 @@ msgstr ""
 "サーバー証明書の長さや、サーバー証明書のチェインの深さが暗号ライブラリで規定"
 "されている長さを越えています"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "ソフトウェアが古すぎます"
+
+#: ../libempathy/empathy-utils.c:375
+#, fuzzy
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "間隔 (秒)"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
-msgstr "すぐ近くにいる人達"
+msgstr "People Nearby"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
-msgstr ""
+msgstr "Google トーク"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分前"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 時間前"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 日前"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週間前"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ヶ月前"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未来に"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
-#, fuzzy
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
-msgstr "アカウント"
+msgstr "すべてのアカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "パスワード"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "サーバー"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ポート番号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-#, fuzzy
-#| msgid "Empathy Accounts"
-msgid "My Web Accounts"
-msgstr "Empathy のアカウント"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-#, fuzzy
-#| msgid "Empathy Accounts"
-msgid "Launch My Web Accounts"
-msgstr "Empathy のアカウント"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, fuzzy, c-format
-#| msgid "_Edit"
-msgid "Edit %s"
-msgstr "編集(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ユーザー名:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "適用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "ログイン(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "このアカウントはすでにサーバーに存在します"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "サーバーで新しいアカウントを作る"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "中止(_N)"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s にある %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s アカウント"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新しいアカウント"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例:</b> MyScreenName"
+#: ../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:"
+msgstr "パスワード(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "詳細"
+msgid "Screen _Name:"
+msgstr "スクリーン名(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "パスワード(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "パスワードを記憶する"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-#, fuzzy
-#| msgid "Password"
-msgid "Remember Password"
-msgstr "パスワード"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ポート番号(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "スクリーン名(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "サーバー(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIMのパスワードを入力してください"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "詳細"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
-msgstr "AIMのスクリーンネームを入力してください"
+msgstr "AIM のスクリーンネームを入力してください"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ポート番号(_P):"
+msgid "What is your AIM password?"
+msgstr "AIMのパスワードを入力してください"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "サーバー(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "パスワードを記憶する"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "ログイン名(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-msgid "What is your GroupWise User ID?"
-msgstr "GroupWiseのUser IDを入力してください"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例:</b> username"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+msgid "What is your GroupWise User ID?"
+msgstr "GroupWise の User ID を入力してください"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
-msgstr "GroupWiseのパスワードを入力してください"
+msgstr "GroupWise のパスワードを入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ UIN(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>例:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "文字集合(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ UIN(_U):"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
-msgstr "ICQ UINを入力してください"
+msgstr "ICQ UIN を入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
-msgstr "ICQのパスワードを入力してください"
+msgstr "ICQ のパスワードを入力してください"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.c:206
 #: ../libempathy-gtk/empathy-account-widget-sip.c:239
@@ -1050,23 +1019,30 @@ msgstr "Options"
 msgid "None"
 msgstr "なし"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "ネットワーク"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "文字集合:"
+msgid "Network:"
+msgstr "ネットワーク:"
 
+# 元の語によらず、「文字エンコーディング」と訳す(ヘルプの対応する項も参照)。
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid ""
-"Most IRC servers don't need a password, so if you're not sure, don't enter a "
-"password."
-msgstr ""
+msgid "Character set:"
+msgstr "文字エンコーディング:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "ネットワーク"
+msgid "Servers"
+msgstr "サーバー"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "ネットワーク:"
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"たいていの IRC サーバーでは、パスワードは不要です。わからなければ、パスワード"
+"を入力しないでください。"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -1084,48 +1060,20 @@ msgstr "終了時のメッセージ:"
 msgid "Real name:"
 msgstr "氏名:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "サーバー"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "IRC のニックネームは何ですか?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "どの IRC ネットワークですか?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "TLS/SSL での暗号化が必要(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSLの証明書に関連するエラーは無視(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "サーバーの設定を上書きする"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "優先度(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "IRC のニックネームは何ですか?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "リソース(_U):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "あなたの Facebook のユーザー名は何ですか?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1139,178 +1087,202 @@ msgstr ""
 "まだ持っていないのであれば、<a href=\"http://www.facebook.com/username/\">こ"
 "のページ</a>を使って Facebook のユーザー名を選択してください。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "古い SSL を使う(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "あなたの Facebook のパスワードは何ですか?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "あなたの Facebook のユーザー名は何ですか?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
-msgstr "Google IDを入力してください"
+msgstr "Google ID を入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
-msgstr "Googleのパスワードを入力してください"
+msgstr "Google のパスワードを入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
-msgid "What is your Jabber ID?"
-msgstr "Jabber IDを入力してください"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例:</b> user@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Jabberパスワードを入力してください"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL の証明書に関連するエラーは無視(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "優先度(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "リソース(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "TLS/SSL での暗号化が必要(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "古い SSL を使う(_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "サーバーの設定を上書き"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
-msgid "What is your desired Jabber ID?"
-msgstr "希望するJabber IDを入力してください"
+msgid "What is your Jabber ID?"
+msgstr "Jabber ID を入力してください"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "希望する Jabber ID を入力してください"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Jabber パスワードを入力してください"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
-msgstr "希望するJabberパスワードを入力してください"
+msgstr "希望する Jabber パスワードを入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>例:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
-msgstr "あなたの Windows Live ID は何ですか?"
+msgstr "Windows Live ID を入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Windows Live のパスワードを入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-メールアドレス(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "ニックネーム(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "姓(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "名前(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "公称(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "名字(_L):"
+msgid "E-_mail address:"
+msgstr "E-メールアドレス(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公称(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ユーザー名(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>例:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "認証用ユーザー名:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "バインディングの探索"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN サーバーを自動的に探索する"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr ""
+msgid "NAT Traversal Options"
+msgstr "NAT 超えオプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "間隔 (秒)"
+msgid "Proxy Options"
+msgstr "プロキシのオプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive オプション"
+msgid "Miscellaneous Options"
+msgstr "その他のオプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "緩いルーティング"
+msgid "STUN Server:"
+msgstr "STUN サーバー:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "メカニズム:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN サーバーを自動的に探索する"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "その他のオプション"
+msgid "Discover Binding"
+msgstr "バインディングの探索"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 超えオプション"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "サーバー:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive オプション"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "ポート番号:"
+msgid "Mechanism:"
+msgstr "メカニズム:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "プロキシのオプション"
+msgid "Interval (seconds)"
+msgstr "間隔 (秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "認証用ユーザー名:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "トランスポート:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN サーバー:"
+msgid "Loose Routing"
+msgstr "緩いルーティング"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "サーバー:"
+msgid "Ignore TLS Errors"
+msgstr "TLS エラーを無視する"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "トランスポート:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
+msgid "Port:"
+msgstr "ポート番号:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "SIPアカウントのパスワードを入力してください"
+msgid "What is your SIP login ID?"
+msgstr "SIP のログイン ID を入力してください"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "What is your SIP login ID?"
-msgstr "SIPのログインIDを入力してください"
+msgid "What is your SIP account password?"
+msgstr "SIP アカウントのパスワードを入力してください"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ユーザー名(_U):"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! の ID(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
-msgstr "会議とチャットルームへの勧誘を無視(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "What is your Yahoo! ID?"
-msgstr "Yahoo! IDを入力してください"
+msgstr "会議と談話室への招待を無視(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "What is your Yahoo! password?"
-msgstr "Yahoo!のパスワードを入力してください"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "談話室の一覧がある場所(_R):"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! の ID(_D):"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "Yahoo! ID を入力してください"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "部屋の一覧がある場所(_R):"
+msgid "What is your Yahoo! password?"
+msgstr "Yahoo! のパスワードを入力してください"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
@@ -1322,10 +1294,8 @@ msgid "None of the accepted image formats are supported on your system"
 msgstr "受付られた画像の形式が、お使いのシステムでサポートされていません"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:819
-#, fuzzy
-#| msgid "Couldn't convert image"
 msgid "Couldn't save picture to file"
-msgstr "画像を変換できませんでした"
+msgstr "画像をファイルに保存できませんでした"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
@@ -1352,105 +1322,100 @@ msgid "Click to enlarge"
 msgstr "クリックすると大きくなります"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
-#, fuzzy
-#| msgid "There was an error while creating the account."
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
-msgstr "アカウントの作成中にエラーが発生しました。"
+msgstr "呼び出し中にエラーが発生しました。"
 
 #: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
-msgstr ""
+msgstr "選択した相手先は通話をサポートしていません"
 
 #: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
-#| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "選択した仲間はオフラインです。"
+msgstr "選択した相手先はオフラインです"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
-#| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "選択した仲間はオフラインです。"
+msgstr "選択した相手先は有効ではありません"
 
 #: ../libempathy-gtk/empathy-call-utils.c:57
-#, fuzzy
-#| msgid "Topic not supported on this conversation"
 msgid "Emergency calls are not supported on this protocol"
-msgstr "この会話ではトピックはサポートされていません"
+msgstr "このプロトコルは緊急呼び出しをサポートしていません"
+
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "この通話を行うにはクレジットが不足しています"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "プライベートなチャットを開けませんでした"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "この会話ではトピックはサポートされていません"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "トピックの変更は許可されていません"
 
 #: ../libempathy-gtk/empathy-chat.c:973
-#, fuzzy, c-format
-#| msgid "invalid contact"
+#, c-format
 msgid "“%s” is not a valid contact ID"
-msgstr "無効な仲間です"
+msgstr "“%s” は無効な相手先 ID です"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: 現在の会話からすべてのメッセージをクリア"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <トピック>: 現在の会話のトピックを設定"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <チャットルームID>: 新しくチャットルームに参加"
+msgstr "/join <談話室ID>: 新しく談話室に参加"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <チャットルームID>: 新しくチャットルームに参加"
+msgstr "/j <談話室ID>: 新しく談話室に参加"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
-msgstr ""
+msgstr "/part [<談話室ID>] [<理由>]: 談話室(デフォルトでは現在の談話室)を退出"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <コンタクトID> [<メッセージ>]: プライベートなチャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <コンタクトID> <メッセージ>: プライベートなチャットを開始"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ニックネーム>: 現在のサーバーでのあなたのニックネームを変更"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <メッセージ>: ACTION メッセージを現在の会話に送る"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 "/say <メッセージ>: <メッセージ> を現在の会話に送り込む。これは '/' で始まる"
-"メッセージを送信する時に使われます。例: \"/say /join は新しくチャットルームに"
-"参加するのに使います\""
+"メッセージを送信する時に使われます。例: \"/say /join は新しく談話室に参加する"
+"のに使います\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/whois <相手先ID>: 相手先についての情報を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1458,165 +1423,178 @@ msgstr ""
 "/help [<コマンド>]: サポートされているコマンドすべてを表示。<コマンド> を指定"
 "したら、その使用方法を表示"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "使い方: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "不明なコマンド"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "不明なコマンドです、/help で利用可能なコマンドを表示してください"
 
+#: ../libempathy-gtk/empathy-chat.c:1541
+msgid "insufficient balance to send message"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "'%s' というメッセージを送信する際にエラー: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "メッセージを送信する際にエラー: %s"
+
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
-msgid "insufficient balance to send message"
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "オフライン"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
-msgstr "無効な仲間です"
+msgstr "無効な相手先です"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "権限がありません"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "メッセージが長すぎます"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "未実装です"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "原因不明です"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "'%s' というメッセージを送信する際にエラー: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, fuzzy, c-format
-#| msgid "Error sending message '%s': %s"
-msgid "Error sending message: %s"
-msgstr "'%s' というメッセージを送信する際にエラー: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "トピック:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "新しいトピック: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, fuzzy, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "新しいトピック: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "トピックはありません"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(提案なし)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2289
 #, c-format
 msgid "Add '%s' to Dictionary"
-msgstr ""
+msgstr "'%s' を辞書に追加する"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
-msgstr ""
+msgstr "'%s' を %s の辞書に追加する"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "スマイリーの挿入"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "送信(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "スペルの提案(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "最近のログの取得に失敗しました"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
-msgstr "%s は切断されました"
+msgstr "%s は切断しました"
 
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
-msgstr "%1$s は %2$s にkickされました"
+msgstr "%1$s は %2$s に kick されました"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
-msgstr "%s はkickされました"
+msgstr "%s は kick されました"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
-msgstr "%1$s が %2$s にBANされました"
+msgstr "%1$s が %2$s に BAN されました"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
-msgstr "%s はBANされました"
+msgstr "%s は BAN されました"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
-msgstr "%s さんが部屋から退室しました"
+msgstr "%s さんが談話室から退出しました"
 
 #. Note to translators: this string is appended to
 #. * notifications like "foo has left the room", with the message
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
-msgstr "%s さんが部屋に入室しました"
+msgstr "%s さんが談話室に参加しました"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s は %s になりました"
@@ -1624,731 +1602,676 @@ msgstr "%s は %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:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "不通"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
-msgstr ""
+msgstr "パスワードを保存しますか?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
-#, fuzzy
-#| msgid "Members"
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
-msgstr "メンバー"
+msgstr "記憶する"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
-msgstr ""
+msgstr "今はしない"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "再挑戦"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "パスワードが間違っています、再度挑戦してください:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
-msgstr "この部屋はパスワードで保護されています:"
+msgstr "この談話室はパスワードで保護されています:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
-msgstr "入室する"
+msgstr "参加する"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "オンライン"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "会話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
-#, fuzzy, c-format
-#| msgid "%s (%s)"
+#: ../libempathy-gtk/empathy-chat.c:4107
+#, c-format
 msgid "%s (SMS)"
-msgstr "%s (%s)"
+msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
-#, fuzzy
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "権限がありません"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
-msgstr ""
+msgstr "相手先をブロックできません"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
-#, fuzzy
-#| msgid "Linked Contacts"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
-msgstr "リンク中の仲間"
+msgstr "ブロックする相手先の編集"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "アカウント:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
-#| msgid "Linked Contacts"
 msgid "Blocked Contacts"
-msgstr "リンク中の仲間"
+msgstr "ブロック中の相手先"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
-#, fuzzy
-#| msgid "_Remove"
 msgid "Remove"
-msgstr "削除(_R)"
+msgstr "削除"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "リンク先のコピー(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "リンクを開く(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
-msgstr "%Y年%B%e日 %A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "仲間情報の編集"
+msgstr "%Y年%b%e日 %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "個人の情報"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
-msgstr "新しい仲間"
+msgstr "新しい相手先"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
-msgstr ""
+msgstr "%s をブロックしますか?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
+msgstr "ほんとうに今後 '%s' からの連絡をブロックしますか?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
-msgstr ""
+msgstr "ブロック(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] ""
+msgstr[0] "この相手先を不快・不適切として通報する(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "あとで決める(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "登録のリクエスト"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "グループ無所属"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "お気に入りの人達"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "本当に '%s' というグループを削除しますか?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "グループの削除"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "削除(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "本当に '%s' という仲間を削除しますか?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "仲間の削除"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "仲間の追加(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-#, fuzzy
-#| msgid "_Contact"
-msgid "_Block Contact"
-msgstr "仲間(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "会話(_C)"
+msgstr "相手先のブロック(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音声で会話(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "映像で会話(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "会話の履歴(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "ファイルの送信"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "デスクトップを共有する"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "お気に入り"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "情報(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "この部屋に招待します"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "チャットルームに招待する(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "あとで決める(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
-#, fuzzy
-#| msgid "Select a contact"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
-msgstr "連絡先の選択"
+msgstr "相手先の検索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
-#, fuzzy
-#| msgid "Search"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "検索"
+msgstr "検索:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
-#, fuzzy
-#| msgid "_Add Contact…"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
-msgstr "仲間の追加(_A)…"
+msgstr "相手先を追加(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
-#, fuzzy
-#| msgid "No match found"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
-msgstr "見つかりませんでした"
+msgstr "相手先が見つかりませんでした"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
-msgstr ""
+msgstr "自己紹介のメッセージ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "連絡先の選択"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "氏名:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "電話番号:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-メールアドレス:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ウェブサイト:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "誕生日:"
-
-#. 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-contact-widget.c:346
-#, fuzzy
-#| msgid "_Last Name:"
-msgid "Last seen:"
-msgstr "名字(_L):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-#, fuzzy
-#| msgid "Connected"
-msgid "Connected from:"
-msgstr "オンライン"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-#, fuzzy
-#| msgid "Quit message:"
-msgid "Away message:"
-msgstr "終了時のメッセージ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:568
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 #, fuzzy
-#| msgid "Ca_ncel"
 msgid "Channels:"
 msgstr "中止(_N)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "ISOによる国コード:"
+msgstr "ISO による国コード:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "連邦・州:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "都市:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地域:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "郵便番号:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "通り:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "ビル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "階:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "部屋番号:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "テキスト:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "説明:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:772
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:774
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "精度のレベル:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:776
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "エラー:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:778
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:780
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (メートル):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:782
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:784
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方位:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:786
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "上昇速度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "最後のアップデートは:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:790
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "経度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:794
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "高度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:847
+#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "場所"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:864
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:916
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
-msgstr "%Y年%B%e日 %R UTC"
+msgstr "%Y年%b%e日 %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:998
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "アバターの保存"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1054
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "アバターを保存できません"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>場所</b> で (date)\t"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "氏名:"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "別名:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "電話番号"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "クライアント情報"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-メールアドレス"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "クライアント:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "ウェブサイト"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "仲間の詳細"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "誕生日"
+
+#. 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
+#, fuzzy
+msgid "Last seen:"
+msgstr "名字(_L):"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+#, fuzzy
+msgid "Connected from:"
+msgstr "オンライン"
+
+#. 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 "離席時のメッセージ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#, fuzzy
+msgid "work"
+msgstr "仕事"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#, fuzzy
+msgid "home"
+msgstr "自宅"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#, fuzzy
+msgid "mobile"
+msgstr "モバイル"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#, fuzzy
+msgid "voice"
+msgstr "音声"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#, fuzzy
+msgid "preferred"
+msgstr "設定"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#, fuzzy
+msgid "parcel"
+msgstr "外観"
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
-msgstr "スクリーン名:"
+msgstr "名称:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "別名:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>場所</b> で (date)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "相手先の詳細"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "情報の取得中…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "クライアント情報"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "バージョン:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "クライアント:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"この仲間を登録するグループを選択してください (1つ以上のグループを選択したり、"
-"あるいは全く選択しなくても構いません)"
+"この相手先を登録するグループを選択してください (2つ以上のグループを選択した"
+"り、あるいは全く選択しなくても構いません)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "グループの追加(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 #, fuzzy
-#| msgid "Select"
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "選択"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "グループ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
-msgstr[0] ""
+msgstr[0] "以下の ID をブロックします:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
-msgstr[0] ""
-
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "リンク中の仲間"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "リンクする連絡先の選択"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "新しい仲間をプレビュー"
+msgstr[0] "以下の ID はブロックできません:"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "左の一覧で選択した仲間は互いにリンクしています"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "相手先情報の編集"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr ""
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "発信"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 #, fuzzy
-#| msgid "File"
 msgid "Mobile"
-msgstr "ファイル"
+msgstr "モバイル"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 #, fuzzy
-#| msgid "Word"
 msgid "Work"
-msgstr "単語"
+msgstr "仕事"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
-msgstr ""
+msgstr "自宅"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "相手先をブロック(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "チャット(_C)"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
+msgstr "_SMS"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音声通話(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ビデオ通話(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "会話の履歴(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ファイルの送信"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "デスクトップを共有する"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "お気に入り"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#, fuzzy
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "telepathy-salut がインストールされていません"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "情報(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "仲間をリンク(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "この談話室に招待します"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "談話室に招待する(_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "相手先を追加(_A)…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
-msgstr ""
+msgstr "削除してブロック(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "本当に '%s' というグループを削除しますか?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "グループの削除"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "削除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "本当に '%s' という相手先を削除しますか?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
 "remove all the contacts which make up this linked contact."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
-#, fuzzy, c-format
-#| msgid "Meta-contact containing %u contact"
-#| msgid_plural "Meta-contact containing %u contacts"
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "相手先の削除"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
-msgstr[0] "%u 人の仲間を含むメタコンタクト"
+msgstr[0] "%u 人の相手先を含むメタ相手先"
 
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:1
 msgid "<b>Location</b> at (date)"
 msgstr "(date) に <b>場所</b>"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新しいネットワーク"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC ネットワークを選択"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
-msgstr ""
+msgstr "ネットワークの一覧をリセット(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 #, fuzzy
-#| msgid "Select"
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "選択"
@@ -2361,290 +2284,258 @@ msgstr "新しいサーバー"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "仲間に接続"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "リンクを外す(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-#, fuzzy
-#| msgid ""
-#| "Completely split the displayed meta-contact into the contacts it contains."
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "メタコンタクトをメタコンタクトが含んでいる仲間に完全に分割します。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "リンク(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, fuzzy, c-format
-#| msgid "Unlink meta-contact '%s'?"
-msgid "Unlink linked contacts '%s'?"
-msgstr "メタコンタクト '%s' のリンクを外しますか?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-#, fuzzy
-#| msgid ""
-#| "Are you sure you want to unlink this meta-contact? This will completely "
-#| "split the meta-contact into the contacts it contains."
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"このメタコンタクトのリンクを外したいですか? メタコンタクトを、それが含んでる"
-"仲間に完全に分割することになります。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "リンクを外す(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
-msgstr ""
+msgstr "履歴"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
-msgstr ""
+msgstr "表示"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "検索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
 msgid "Chat in %s"
-msgstr "%sで発信"
+msgstr "%s でチャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
 msgid "Chat with %s"
-msgstr "%sで発信"
+msgstr "%s とチャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
-#, fuzzy
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%Y年%B%e日 %A"
+msgstr "%Y年%b%e日 %A %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr ""
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
-#, fuzzy, c-format
-#| msgid "<b>Topic:</b>"
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
 msgid "<b>%s:</b> %s"
-msgstr "<b>トピック:</b>"
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
-#, fuzzy, c-format
-#| msgid "%d second ago"
-#| msgid_plural "%d seconds ago"
+#: ../libempathy-gtk/empathy-log-window.c:1373
+#, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
-msgstr[0] "%d 秒前"
+msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
-#, fuzzy, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
-msgstr[0] "%d 分前"
+msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
-msgstr ""
+msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
-#, fuzzy
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
-msgstr "西欧"
+msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
-#, fuzzy
-#| msgid "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
-msgstr "%Y年%B%e日 %A"
+msgstr "%Y年%b%e日"
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
-msgstr ""
+msgstr "すべて"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
-#, fuzzy
-#| msgid "None"
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
-msgstr "なし"
+msgstr "すべて"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
-msgstr ""
+msgstr "相手先または談話室"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
-msgstr ""
+msgstr "日付"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
-msgstr ""
+msgstr "すべて"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
-#, fuzzy
-#| msgid "Set status"
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
-msgstr "状態を設定"
+msgstr "文字チャット"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
-#, fuzzy
-#| msgid "Call"
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
-msgstr "発信"
+msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
-#, fuzzy
-#| msgid "Incoming call"
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
-msgstr "着信があります"
+msgstr "着信"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
-#, fuzzy
-#| msgid "Outgoing voice call"
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
-msgstr "音声で呼びかけた"
+msgstr "発信"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
-#, fuzzy
-#| msgid "Incoming call from %s"
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
-msgstr "%s さんからの呼び出しです"
+msgstr "失敗した通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
-#, fuzzy
-#| msgid "Chat"
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
-msgstr "チャット"
+msgstr "種類"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
+msgstr "会話の履歴のすべてを消去してもいいですか?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
-#, fuzzy
-#| msgid "C_lear"
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
-msgstr "クリア(_L)"
+msgstr "すべて消去"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+# 日本語の語順からして、しかたなく「アカウント:」とする
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
-msgstr ""
+msgstr "アカウント:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr ""
+msgid "_File"
+msgstr "ファイル(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "チャット"
+#: ../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 "編集(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
-msgstr ""
+msgstr "すべての履歴を消去..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
-msgstr ""
+msgstr "相手先の情報"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "映像"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "チャット"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "編集(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "ビデオ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-#, fuzzy
-#| msgid "File"
-msgid "_File"
-msgstr "ファイル"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "仲間の ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">読み込み中...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "チャット(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "相手先はオフラインです"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "選択した相手先は有効でないか不明です"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "この相手先はこの種類の会話をサポートしていません"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "この機能は、このプロトコルでは実装されていません"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "この相手先と会話を始めることができませんでした"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "このチャンネルから締め出されています"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "このチャンネルは満員です"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "このチャンネルに参加するには招待される必要があります"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#, fuzzy
+msgid "Can't proceed while disconnected"
+msgstr "相手先がサインアウトした"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "権限がありません"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "会話を開始する際にエラーが起こりました"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "相手先の ID か電話番号を入力:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新しい会話"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "映像の送信(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "ビデオ通話(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "呼び出す(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "音声通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
-msgstr "新規呼出"
+msgstr "新しい通話"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "アカウント <b>%s</b> の認証に失敗しました"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../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 ""
+"次のアカウントのパスワードを入力してください\n"
+"<b>%s</b>"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2664,22 +2555,18 @@ msgstr "独自のメッセージを編集…"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "お気に入りの状態から解除するにはクリックします"
+msgstr "クリックすると、この状況メッセージをお気に入りから削除します"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "この状態をお気に入りにするにはクリックします"
+msgstr "クリックすると、この状況メッセージをお気に入りとして保存します"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
-msgstr "状態を設定"
-
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "在席中にし現在の状態を設定する"
+msgstr "在席状況を設定"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "独自のメッセージ…"
 
@@ -2697,24 +2584,20 @@ msgid "Find:"
 msgstr "検索:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
-#| msgid "Match case"
-msgid "Mat_ch case"
-msgstr "大文字小文字を区別して一致"
+msgid "_Previous"
+msgstr "前へ(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "フレーズが見つかりませんでした"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "次へ(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "大文字小文字を区別する(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-#, fuzzy
-#| msgid "_Previous Tab"
-msgid "_Previous"
-msgstr "前のタブへ(_P)"
+msgid "Phrase not found"
+msgstr "フレーズが見つかりませんでした"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2726,15 +2609,15 @@ msgstr "インスタント・メッセージを送信した"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
-msgstr "チャット参加の要求がきた"
+msgstr "チャットの要求がきた"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
-msgstr "仲間がサインインした"
+msgstr "相手先がサインインした"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
-msgstr "仲間がサインアウトした"
+msgstr "相手先がサインアウトした"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
@@ -2746,31 +2629,28 @@ msgstr "サーバーの接続を断した"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
-msgstr "音声で呼びかけられた"
+msgstr "音声通話が着信した"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
-msgstr "音声で呼びかけた"
+msgstr "音声通話で発信した"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
-msgstr "音声の会話が終了した"
+msgstr "音声通話が終了した"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "独自のメッセージを編集"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, fuzzy, c-format
-#| msgid "Message received"
 msgid "Message edited at %s"
 msgstr "メッセージを受信した"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
-#, fuzzy
-#| msgid "N_ormal Size"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
-msgstr "アバターなしの通常サイズ(_O)"
+msgstr "通常サイズ"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
@@ -2789,73 +2669,49 @@ msgid "Blue"
 msgstr "ブルー"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-#, fuzzy
-#| msgid "The identity provided by the chat server cannot be verified.\n"
 msgid "The identity provided by the chat server cannot be verified."
-msgstr "チャットサーバーから提供されるアイデンティティを検証できません。\n"
+msgstr "チャットサーバーから提供される ID を検証できません。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
-#, fuzzy
-#| msgid "The certificate is not signed by a Certification Authority"
 msgid "The certificate is not signed by a Certification Authority."
-msgstr "証明書が認証局によって署名されていません"
+msgstr "証明書が認証局によって署名されていません。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:161
-#, fuzzy
-#| msgid "The certificate has expired"
 msgid "The certificate has expired."
-msgstr "証明書の有効期限が切れています"
+msgstr "証明書の有効期限が切れています。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:164
-#, fuzzy
-#| msgid "The certificate hasn't yet been activated"
 msgid "The certificate hasn't yet been activated."
-msgstr "証明書がまだ有効ではありません"
+msgstr "証明書がまだ有効ではありません。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:167
-#, fuzzy
-#| msgid "The certificate does not have the expected fingerprint"
 msgid "The certificate does not have the expected fingerprint."
-msgstr "証明書が期待したフィンガープリントではありません"
+msgstr "証明書が期待したフィンガープリントではありません。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
-#, fuzzy
-#| msgid ""
-#| "The hostname verified by the certificate doesn't match the server name"
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr "証明書で検証されたホスト名がサーバーの名と一致しません"
+msgstr "証明書で検証されたホスト名がサーバーの名と一致しません。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
-#, fuzzy
-#| msgid "The certificate is self-signed"
 msgid "The certificate is self-signed."
-msgstr "証明書は自己署名されています"
+msgstr "証明書は自己署名されています。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:177
-#, fuzzy
-#| msgid ""
-#| "The certificate has been revoked by the issuing Certification Authority"
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
-msgstr "証明書が発行者である認証局によって取り消されています"
+msgstr "証明書が発行者である認証局によって失効しています。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:181
-#, fuzzy
-#| msgid "The certificate is cryptographically weak"
 msgid "The certificate is cryptographically weak."
-msgstr "証明書が暗号的に弱いです"
+msgstr "証明書が暗号的に弱いです。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:184
-#, fuzzy
-#| msgid "The certificate length exceeds verifiable limits"
 msgid "The certificate length exceeds verifiable limits."
-msgstr "証明書が検証可能な長さを越えています"
+msgstr "証明書が検証可能な長さを越えています。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:188
-#, fuzzy
-#| msgid "The certificate is malformed"
 msgid "The certificate is malformed."
-msgstr "証明書に異常があります"
+msgstr "証明書に異常があります。"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
@@ -2872,37 +2728,43 @@ msgid "Continue"
 msgstr "続行"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "この接続は信用できません。無視して続けますか?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "この選択を将来の接続でも記憶する"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "証明書の詳細"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI を開けません"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "ファイルの選択"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
-msgstr ""
+msgstr "ファイルを保存するには空き容量が不足しています"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
+"このファイルを保存するには %s の空き容量が必要ですが、%s しかありません。別の"
+"場所を選んでください。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s さんから送られてきたファイル"
@@ -3074,41 +2936,32 @@ msgstr "西欧"
 msgid "Vietnamese"
 msgstr "ベトナム語"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "選択した仲間はファイルを受信できません。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "選択した仲間はオフラインです。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "エラーメッセージなし"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
-msgstr "インスタント メッセージ (Empathy)"
+msgstr "インスタントメッセージ (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "起動したら自動的にサインインしない"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "起動時に仲間リストや他のダイアログを表示しない"
+msgstr "起動時に相手先の一覧や他のダイアログを表示しない"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
-msgstr "- Empathy インスタント・メッセンジャー"
+msgstr "- Empathy インスタントメッセンジャー"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr ""
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, fuzzy, c-format
-#| msgid "There was an error while parsing the account details."
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
 "The error was:\n"
@@ -3123,7 +2976,7 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"Empathy はフリーソフトウェアです;フリーソフトウェア財団が提供する GNU 一般公"
+"Empathy はフリーソフトウェアです; フリーソフトウェア財団が発行する GNU 一般公"
 "衆利用許諾契約書の第二版、あるいはそれ以降の版が定める条項の下で本プログラム"
 "を再頒布または変更することができます。"
 
@@ -3134,9 +2987,9 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"Empathy は有用とは思いますが、その頒布にあたっては市場性及び特定の目的、その"
-"適合性についての暗黙の保証を含めて、いかなる保証も行ないません。詳細について"
-"は GNU 一般公衆利用許諾契約書をご覧ください。"
+"Empathy は役立つものであることを期待して配布されていますが、完全に無保証で"
+"す。商用利用または特定の目的における適合性の保証はありません。詳細は GNU 一般"
+"公衆利用許諾契約書をご覧ください。"
 
 #: ../src/empathy-about-dialog.c:89
 msgid ""
@@ -3148,11 +3001,11 @@ msgstr ""
 "るはずです。そうでない場合は、Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA まで手紙を書いてください。"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME 向けのインスタント・メッセンジャー・クライアントです。"
+msgstr "GNOME 向けインスタントメッセンジャー・クライアント"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "相花 毅 <takeshi.aihana@gmail.com>\n"
@@ -3161,6 +3014,7 @@ msgstr ""
 "(Contributed to Moblin by Intel GLS)\n"
 "草野 貴之 <AE5T-KSN@asahi-net.or.jp>\n"
 "西堀 清貴 <ml.nishibori.kiyotaka@gmail.com>\n"
+"Mako N <mako@pasero.net>\n"
 "日本GNOMEユーザー会 <http://www.gnome.gr.jp/>"
 
 #: ../src/empathy-account-assistant.c:167
@@ -3193,79 +3047,81 @@ msgstr ""
 "らアカウントを後で追加することもできます。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "エラーが発生しました"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "どの種類のアカウントがありますか?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "設定したい他のアカウントはありますか?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "アカウントの詳細を入力"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "生成したいアカウントの種類は?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "他のアカウントを生成しますか?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "新しいアカウントの詳細を入力"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"Empathyで近くの人や友達や同僚とGoogle Talk、AIM、Windows Liveや他のプログラム"
-"で会話ができます。マイクやウェブカメラでも音声や映像で会話ができます。"
+"Empathy を使って、近くの人や友達や同僚と Google トーク、AIM、Windows Live や"
+"他のプログラムでチャットできます。マイクやウェブカメラでも音声やビデオで通話"
+"できます。"
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
-msgstr "他の会話用プログラムで利用してきたアカウントはありますか?"
+msgstr "他のチャットプログラムで利用してきたアカウントはありますか?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "はい、アカウントの詳細をインポートします "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "はい、今アカウントの詳細を入力します"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "いいえ、新しいアカウントを作成します"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "いいえ、今近くでオンラインの人を見たいだけです"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "インポートしたいアカウントを選択します:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "はい"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "いいえ、今はこれで十分です"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 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 "
@@ -3277,18 +3133,16 @@ msgstr ""
 "してください。'アカウント' のダイアログで、後で詳細は簡単に変更できます。ま"
 "た、この機能を無効にすることもできます。"
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "編集 → アカウント"
 
-#: ../src/empathy-account-assistant.c:1107
-#, fuzzy
-#| msgid "I don't want to enable this feature for now"
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
-msgstr "この機能を今は有効にしたくありません"
+msgstr "この機能を今は有効にしたくありません(_N)"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1148
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3297,88 +3151,96 @@ msgid ""
 msgstr ""
 "ローカルネットワークに接続した人々とチャットすることができません。telepathy-"
 "salut がインストールされていないためです。この機能を有効にするには、"
-"telepathy-salut パッケージをインストールし、アカウントダイアログから「すぐ近"
-"くにいる人達」のアカウントを作成してください。"
+"telepathy-salut パッケージをインストールし、アカウントダイアログから People "
+"Nearby のアカウントを作成してください。"
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut がインストールされていません"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "メッセージングと VoIP のアカウントアシスタント"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
-msgstr "ようこそEmpathyへ"
+msgstr "ようこそ Empathy へ"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
-msgstr "存在するアカウントをインポートします"
+msgstr "既存のアカウントをインポートします"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "個人の詳細な情報を入力してください"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
-msgstr "保存されてない　%s アカウントへの変更があります。"
+msgstr "%s アカウントへの保存されていない変更があります。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
-msgstr "あなたの新しいアカウントはまだ保存されていません。"
+msgstr "新しいアカウントはまだ保存されていません。"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connecting…"
 msgstr "接続中…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline — %s"
 msgstr "オフライン — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected — %s"
 msgstr "切断 - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline — No Network Connection"
 msgstr "オフライン - ネットワーク接続がありません"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "不明な状態"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline — Account Disabled"
 msgstr "オフライン - アカウントが無効"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"変更を破棄して新しいアカウントを生成しようとしています。\n"
-"本当に継続しますか?"
+#: ../src/empathy-accounts-dialog.c:530
+msgid "Edit Connection Parameters"
+msgstr "接続パラメーターを編集"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "サーバーから個人情報を取得するのに失敗しました。"
+
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "個人情報を編集するには、オンラインにしてください。"
+
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "接続パラメーターの編集(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1289
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "コンピューターから %s を削除しますか?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "これによって、サーバーからアカウントが削除されることはありません。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1529
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3387,19 +3249,15 @@ msgstr ""
 "本当に継続しますか?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
-#, fuzzy
-#| msgid "_Enabled"
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
-msgstr "サインイン(_E)"
+msgstr "有効化(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
-#, fuzzy
-#| msgid "_Enabled"
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
-msgstr "サインイン(_E)"
+msgstr "無効化(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2176
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3408,24 +3266,18 @@ msgstr ""
 "本当に継続しますか?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
-#| msgid "_Add…"
 msgid "Add…"
-msgstr "追加(_A)…"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "アカウントの情報を読み込み中"
+msgstr "追加…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "プロトコルがインストールされていません"
+msgid "_Import…"
+msgstr "インポート(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "プロトコル:"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3433,160 +3285,144 @@ msgstr ""
 "新しいアカウントを登録するには、まず最初に利用するプロトコルのバックエンドを"
 "インストールしておいてください。"
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "プロトコルがインストールされていません"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "インポート(_I)…"
+msgid "Loading account information"
+msgstr "アカウントの情報を読み込み中"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy 認証クライアント"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy 認証クライアント"
 
 #: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
-msgstr "すぐ近くにいる人達"
+msgstr "People nearby"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy 音声/映像クライアント"
+msgstr "- Empathy 音声/ビデオ・クライアント"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
-msgstr "Empathy 音声/映像クライアント"
+msgstr "Empathy 音声/ビデオ・クライアント"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "コントラスト"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "明るさ"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "ガンマ"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "サイドバー(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
-msgstr "音声"
+msgstr "音声入力"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
-msgstr "映像"
+msgstr "ビデオ入力"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "ダイアルパッド"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "詳細"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
-msgstr "%sで発信"
+msgstr "%s との通話"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "このマシンで見かけたIPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "インターネット上のサーバーで見かけたIPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "もう一方のほうで見かけたピアのIPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "リレーサーバーのIPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "マルチキャストグループのIPアドレス"
 
-#: ../src/empathy-streamed-media-window.c:1843
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "不明"
-
-#: ../src/empathy-streamed-media-window.c:1846
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "不明"
-
-#: ../src/empathy-streamed-media-window.c:1849
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "不明"
-
-#: ../src/empathy-streamed-media-window.c:1852
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
 msgid "Unknown"
 msgstr "不明"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "接続しました — %d分%02d秒"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "技術的な詳細"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr ""
-"%s のソフトウェアはあなたのコンピューターでサポートされているどの音声形式も理"
-"解できません"
+"%s のソフトウェアは、お使いのコンピューターでサポートされているどの音声フォー"
+"マットも理解できません"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr ""
-"%s のソフトウェアはあなたのコンピューターでサポートされているどの映像形式も理"
-"解できません"
+"%s のソフトウェアは、お使いのコンピューターでサポートされているどの動画フォー"
+"マットも理解できません"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3595,29 +3431,29 @@ msgstr ""
 "%s への接続を確立できませんでした。ネットワーク上のどちらかが直接接続を許可さ"
 "れていないのかもしれません。"
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "ネットワークで問題が発生しました"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
-"この呼び出しに必要な音声形式があなたのコンピューターにインストールされていま"
-"せん"
+"この通話に必要な音声フォーマットは、お使いのコンピューターにインストールされ"
+"ていません"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
-"この呼び出しに必要な映像形式があなたのコンピューターにインストールされていま"
-"せん"
+"この通話に必要な動画フォーマットは、お使いのコンピューターにインストールされ"
+"ていません"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3628,275 +3464,302 @@ msgstr ""
 "の不具合を報告</a>してください。その時に、ヘルプメニューの　'デバッグ' ウィン"
 "ドウで集めたログを添付してください。"
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
-msgstr "呼び出しエンジンで問題が発生しました"
+msgstr "通話エンジンで問題が発生しました"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "ストリームの終端に到達しました"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "音声ストリームを確立できません"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "映像ストリームを確立できません"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "音声"
+msgid "_Call"
+msgstr "通話(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "デコード用コーデック:"
+msgid "_Microphone"
+msgstr "マイク(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-#, fuzzy
-#| msgid "_Enabled"
-msgid "Disable camera"
-msgstr "サインイン(_E)"
+msgid "_Camera"
+msgstr "カメラ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr ""
+msgid "_Settings"
+msgstr "設定(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "エンコードするコーデック:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "表示(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "接続を切る"
+#: ../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 "ヘルプ(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "現在の通話を止める"
+#: ../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 "目次(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ローカルな候補:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "デバッグ(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr ""
+msgid "Swap camera"
+msgstr "カメラの入れ替え"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr ""
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "リモートの候補:"
+msgid "Maximise me"
+msgstr ""
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "音声の送信"
+msgid "Disable camera"
+msgstr "カメラを無効化する"
 
 #: ../src/empathy-call-window.ui.h:14
-#, fuzzy
-#| msgid "Send _Video"
-msgid "Send Video"
-msgstr "映像の送信(_V)"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "接続を切る"
 
 #: ../src/empathy-call-window.ui.h:15
-#, fuzzy
-#| msgid "Dialpad"
-msgid "Show dialpad"
-msgstr "ダイアルパッド"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "現在の通話を止める"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Start a video call"
-msgstr ""
+msgid "Video call"
+msgstr "ビデオ通話"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Start an audio call"
-msgstr ""
-
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr ""
+msgid "Start a video call"
+msgstr "ビデオ通話の開始"
 
 #: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "音声の転送をオン・オフ"
+msgid "Start an audio call"
+msgstr "音声通話の開始"
 
 #: ../src/empathy-call-window.ui.h:20
-#, fuzzy
-#| msgid "Toggle audio transmission"
-msgid "Toggle video transmission"
-msgstr "音声の転送をオン・オフ"
+msgid "Show dialpad"
+msgstr "ダイアルパッドを表示"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "不明"
+msgid "Display the dialpad"
+msgstr "ダイヤルパッドの表示"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "映像の送信"
 
 #: ../src/empathy-call-window.ui.h:23
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
-msgid "Video call"
-msgstr "映像で会話(_V)"
+msgid "Toggle video transmission"
+msgstr "ビデオの転送をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "呼び出す(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "音声の送信"
 
 #: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Camera On"
-msgid "_Camera"
-msgstr "カメラ入"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "目次(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "音声の転送をオン・オフ"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "デバッグ(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "エンコードするコーデック:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "ヘルプ(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "不明"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "デコード用コーデック:"
 
 #: ../src/empathy-call-window.ui.h:30
-#, fuzzy
-#| msgid "Megaphone"
-msgid "_Microphone"
-msgstr "メガホン"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "リモートの候補:"
 
 #: ../src/empathy-call-window.ui.h:31
-#, fuzzy
-#| msgid "<b>Settings</b>"
-msgid "_Settings"
-msgstr "<b>設定</b>"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "ローカルな候補:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "表示(_V)"
+msgid "Audio"
+msgstr "音声"
+
+#: ../src/empathy-chat-window.c:285
+#, fuzzy
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "メインウィンドウを隠すかどうかです。"
+
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:310
+#, fuzzy, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "レベル "
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:330
+#, fuzzy
+#| msgid "Level "
+msgid "Leave room"
+msgstr "レベル "
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (未読 %d)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (他に %u)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (他から %d の未読)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (未読は全部で %d)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
-msgstr ""
+msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, fuzzy, c-format
-#| msgid "Typing a message."
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "メッセージを入力しています"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "メッセージを入力しています"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "クリア(_L)"
+msgid "_Conversation"
+msgstr "会話(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "仲間(_O)"
+msgid "C_lear"
+msgstr "消去(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "スマイリーの挿入(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "お気に入りの談話室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "参加者を招待(_P)…"
+msgid "Notify for All Messages"
+msgstr "すべてのメッセージを通知"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "タブを左へ移動(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "相手先の一覧の表示(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "タブを右へ移動(_R)"
+msgid "Invite _Participant…"
+msgstr "参加者を招待(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "すべてのメッセージを通知"
+msgid "C_ontact"
+msgstr "相手先(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "会話(_C)"
+msgid "_Tabs"
+msgstr "タブ(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "タブの取り外し(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "お気に入りのチャットルーム(_F)"
+msgid "_Previous Tab"
+msgstr "前のタブへ(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "次のタブへ(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "前のタブへ(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "閉じたタブを戻す(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "仲間リストの表示(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "タブを左へ移動(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "タブ(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "タブを右へ移動(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "閉じたタブを戻す(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "タブの取り外し(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3904,109 +3767,106 @@ msgstr "名前"
 
 #: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
-msgstr "部屋"
+msgstr "談話室"
 
 #: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "自動サインイン"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
-msgstr "お気に入りの部屋"
+msgstr "お気に入りの談話室"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
-msgstr "映像で呼びかけられた"
+msgstr "ビデオ通話の着信"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "着信があります"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s さんからの映像の着信ですが、応答しますか?"
+msgstr "%s さんからビデオ通話の着信です。応答しますか?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
-msgstr "%s さんからの着信ですが、応答しますか?"
+msgstr "%s さんから着信です。応答しますか?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s さんからの呼び出しです"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒否する(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "応答する(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
-msgstr ""
+msgstr "ビデオで応答(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
-msgstr "%s さんからの映像での呼び出しです"
+msgstr "%s さんからのビデオ通話の着信です"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
-msgstr "チャットルームへの招待"
+msgstr "談話室への招待"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s への参加の招待"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s さんがあなたを %s に招待しています"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "お断りする(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
-msgstr "参加する(_J)"
+msgstr "参加(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s さんがあなたを %s に招待しました"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "あなたは %s への参加の招待を受け取りました"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s さんからファイル転送のお知らせです"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
-#, fuzzy
-#| msgid "Password"
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
-msgstr "パスワード"
+msgstr "パスワードが必要です"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, fuzzy, c-format
-#| msgid "%s would like to send you a file"
 msgid "%s would like permission to see when you are online"
 msgstr "%s さんがあなたにファイルを送信したいようです"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -4016,105 +3876,105 @@ msgstr ""
 "メッセージ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s で %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" を %s さんから受信中"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" から %s へ送信中"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" を %s から受信エラー"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ファイル受信エラー"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" の %s への送信エラー"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ファイル転送エラー"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" を %s さんから受信しました"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" を %s さんに送信します"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ファイルの転送が完了しました"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "他の参加者の応答を待っています"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" の完全性をチェックしています"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "ハッシュ計算中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ファイル"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "残り"
 
@@ -4124,194 +3984,209 @@ msgstr "ファイル転送"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr "Remove completed, canceled and failed file transfers from the list"
+msgstr "終了・停止・失敗したファイル転送を一覧から削除します"
 
 #: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"取り込めそうなアカウントが見つかりませんでした。ちなみに、現在取り込みをサ"
-"ポートしているのは Pidgin のアカウントだけです。"
+"インポート可能なアカウントが見つかりませんでした。現在のところ、インポートを"
+"サポートしているのは Pidgin のアカウントだけです。"
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
-msgstr "アカウントの取り込み"
+msgstr "アカウントのインポート"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
-msgstr "取り込む"
+msgstr "インポートする"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "提供元"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:389
 #, fuzzy
-#| msgid "Password"
 msgid "Provide Password"
 msgstr "パスワード"
 
-#: ../src/empathy-main-window.c:398
-#, fuzzy
-#| msgid "Disconnected"
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
-msgstr "不通"
+msgstr "切断"
+
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:660
 msgid "No match found"
 msgstr "見つかりませんでした"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:765
+#, fuzzy, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "%s のアカウントは、%s のソフトウェアを更新するまで使えません。"
+
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "ソフトウェアの更新..."
+
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "閉じる"
+
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "再接続"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "アカウントの編集"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "閉じる"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1138
 #, fuzzy
-#| msgid "Salut account is created"
 msgid "Top up account credit"
 msgstr "Salut のアカウントを生成するかどうか"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr ""
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
-msgstr "仲間"
-
-#: ../src/empathy-main-window.c:2121
-msgid "Contact List"
-msgstr "仲間リスト"
+msgstr "相手先"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "地図上の仲間(_M)"
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
 msgstr ""
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window.c:2419
+msgid "Contact List"
+msgstr "相手先の一覧"
+
+#: ../src/empathy-roster-window.ui.h:1
 #, fuzzy
-#| msgid "Contact List"
-msgid "Find in Contact _List"
-msgstr "仲間リスト"
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "お気に入りに追加(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新しい会話(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "お気に入りの管理"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新しい通話(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "アバターなしの通常サイズ(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "相手先を検索(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "新規に呼び出す(_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ファイル転送(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "アバターありの通常サイズ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "オフラインの相手先を表示(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "プロトコルを表示(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "クレジット残高"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "地図上の相手先(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "アカウント(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "ブロック中の相手先(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "設定(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "プロトコルの表示(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "相手先の一覧で検索(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "名前順に並び替え(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "状態で並び替え(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "アカウント(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "アバターありの通常サイズ(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-#, fuzzy
-#| msgid "Linked Contacts"
-msgid "_Blocked Contacts"
-msgstr "リンク中の仲間"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "アバターなしの通常サイズ(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "コンパクトサイズ(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ファイル転送(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "談話室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "参加(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新しい会話(_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "オフラインの仲間を表示(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人情報(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "部屋(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "お気に入りに追加(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-#, fuzzy
-#| msgctxt "Link individual (contextual menu)"
-#| msgid "_Link Contacts…"
-msgid "_Search for Contacts…"
-msgstr "仲間をリンク(_L)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "お気に入りの管理"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
-msgstr "チャットルーム"
+msgstr "談話室"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "メンバー"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4324,347 +4199,349 @@ msgstr ""
 "パスワードが必要: %s\n"
 "メンバー数: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "いいえ"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
-msgstr "部屋リストの作成を開始できません"
+msgstr "談話室の一覧作成を開始できません"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
-msgstr "部屋リストの作成を停止できません"
+msgstr "談話室の一覧作成を停止できません"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "部屋リストをロードできません"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "談話室に参加する"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
-"入室する部屋の名前を入力するか、下にある一覧から1つ以上の部屋をクリックしてく"
-"ださい"
+"参加する談話室の名前を入力するか、下にある一覧から1つ以上の談話室をクリックし"
+"てください"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "談話室(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"その部屋を提供しているサーバーを入力するか、またはその部屋が現在利用している"
-"サーバーにある場合は空のままにしてください"
+"その談話室を提供しているサーバーを入力するか、またはその談話室が現在利用して"
+"いるサーバーにある場合は空のままにしてください"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "部屋に参加する"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "談話室の一覧をロードできません"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
-msgstr "部屋の一覧"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "部屋(_R):"
+msgstr "談話室の一覧"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "メッセージを受信した"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "メッセージを送信した"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "新しい会話を始めた"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "仲間がサインインした"
+#: ../src/empathy-preferences.c:169
+#, fuzzy
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr "相手先がサインインした"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "仲間がサインアウトした"
+msgstr "相手先がサインアウトした"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "自分がサインインした"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "自分がサインアウトした"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "言語"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
-#, fuzzy
-#| msgid "Client:"
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
-msgstr "クライアント:"
+msgstr "ジュリエット"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
-#, fuzzy
-#| msgid "Room"
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
-msgstr "部屋"
+msgstr "ロミオ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "おお、ロミオ、ロミオ ! なぜにそなたはロミオじゃ !"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "ててごをも嫌い、自身の名をも棄てや。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "それがいやならば、せめてもわしの恋人じゃと誓言しや。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "わしゃもうキャピュレットをやもうほどに。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "もそっと聞こうか? すぐ物を言おうか?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
-#, fuzzy
-#| msgid "%s has disconnected"
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr "%s は切断されました"
+msgstr "ジュリエットは切断しました"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "設定"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "スマイリーをアイコンで表示する(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "談話室の相手先の一覧を表示する(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "外観"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "挙動"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "テーマ(_E):"
+msgid "new ta_bs"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "離席中になったら通知を無効にする(_A)"
+msgid "new _windows"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "離席中になったらサウンドの演奏を無効にする(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "受信したイベントを通知領域に表示する"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "起動したら自動的に接続(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
+msgid "Log conversations"
+msgstr "会話を記録"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "仲間が在席中になったら通知を有効にする"
+msgid "Behavior"
+msgstr "挙動"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "仲間がオフラインになったら通知を有効にする"
+msgid "General"
+msgstr "全般"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "チャット・ウィンドウにフォーカスが無くても通知する(_C)"
+msgid "_Enable bubble notifications"
+msgstr "ポップアップ通知を有効にする(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "スペルチェックを有効にする:"
+msgid "Disable notifications when _away or busy"
+msgstr "離席中または取り込み中のとき通知を無効にする(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "全般"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "チャットウィンドウにフォーカスがなくても通知する(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr ""
+msgid "Enable notifications when a contact comes online"
+msgstr "相手先が在席中になったら通知を有効にする"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr ""
+msgid "Enable notifications when a contact goes offline"
+msgstr "相手先がオフラインになったら通知を有効にする"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "通知"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "場所のソース:"
+msgid "_Enable sound notifications"
+msgstr "サウンド通知を有効にする(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "会話を記録"
+msgid "Disable sounds when _away or busy"
+msgstr "離席中または取り込み中のときサウンドを鳴らさない(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "通知"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "イベントでサウンドを鳴らす"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "サウンド"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "プライバシー"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "通話の質を向上させるためエコー除去を使う(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"位置精度を下げることで、市町村や国の公表がより正確ではなくなります。GPS座標は"
-"小数点第1位まで正確です。"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "スマイリーをアイコンで表示する(_S)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "部屋の仲間リストを表示する(_L)"
+"エコー除去は、あなたの声をよりクリアに相手に届けます。しかし、コンピューター"
+"によっては問題が生じます。奇妙な雑音が聞こえたり通話中に音飛びがある場合は、"
+"エコー除去をオフにして、通話をふたたび始めてください。"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "サウンド"
+msgid "_Publish location to my contacts"
+msgstr "相手先に場所を公開する(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "スペルのチェック"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "言語の一覧はインストールしている辞書の言語のみを反映します。"
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"位置精度を下げることで、国、州(県)、市より精確な場所を公開しません。GPS 座標"
+"は小数点第1位までの精度です。"
 
+#. 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 "Themes"
-msgstr "テーマ"
+msgid "_Reduce location accuracy"
+msgstr "場所の精度を下げる(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-#, fuzzy
-#| msgid "Bearing:"
-msgid "Variant:"
-msgstr "方位:"
+msgid "Privacy"
+msgstr "プライバシー"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "起動したら自動的に接続(_A)"
+msgid "_GPS"
+msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "携帯(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "ポップアップ通知を有効にする(_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ネットワーク (IP、Wi-Fi)(_N)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "サウンド演奏による通知を有効にする(_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "GPS(_G)"
+msgid "Location sources:"
+msgstr "場所のソース:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "ネットワーク(IP、Wi-Fi)(_N)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "言語の一覧はインストールしている辞書の言語のみを反映します。"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "新しい会話の度に別のウィンドウを開く(_O)"
+msgid "Enable spell checking for languages:"
+msgstr "スペルチェックを有効にする:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "自分の仲間に位置を公表する(_P)"
+msgid "Spell Checking"
+msgstr "スペルチェック"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "テーマ(_E):"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "位置精度を下げる(_R)"
+#, fuzzy
+msgid "Variant:"
+msgstr "方位:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "テーマ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "状態"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "仲間を再度呼び出す"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "カメラ切"
+msgid "Redial"
+msgstr "リダイアル"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "カメラ入"
+msgid "V_ideo"
+msgstr "ビデオ(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "ビデオ切"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "カメラを無効にして映像の送信を中止"
+msgid "Video Preview"
+msgstr "ビデオのプレビュー"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "カメラを有効にして映像を送る"
+msgid "Video On"
+msgstr "ビデオ入"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "カメラを有効にするが映像を送らない"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "相手先を再度呼び出す"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "プレビュー"
+msgid "Camera Off"
+msgstr "カメラ切"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "リダイアル"
+msgid "Disable camera and stop sending video"
+msgstr "カメラを無効にして映像の送信を中止"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "映像(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "プレビュー"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "映像切"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "カメラを有効にするが映像を送らない"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "映像入"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "カメラ入"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "映像のプレビュー"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "カメラを有効にして映像を送信"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Contact Map View"
 
@@ -4674,7 +4551,7 @@ msgstr "保存"
 
 #: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
-msgstr "デバッグ・ウィンドウ"
+msgstr "デバッグウィンドウ"
 
 #: ../src/empathy-debug-window.c:1517
 msgid "Pause"
@@ -4730,16 +4607,16 @@ msgid ""
 "extension."
 msgstr "選択した接続マネージャーはリモートデバッグ拡張をサポートしていません。"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "参加者を招待"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
-msgstr "会話に招待する仲間を選んでください"
+msgstr "会話に招待する相手先を選んでください"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "招待する"
 
@@ -4748,11 +4625,9 @@ msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ダイアログを何も表示せず、処理(インポートなど)を進め、終了する"
 
 #: ../src/empathy-accounts.c:187
-#, fuzzy
-#| msgid "Don't display any dialogs if there are any non-Salut accounts"
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "Salut アカウントがなければ、ダイアログを何も表示しない"
+msgstr "\"People Nearby\" アカウントがなければ、ダイアログを何も表示しない"
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
@@ -4764,109 +4639,266 @@ msgstr ""
 msgid "<account-id>"
 msgstr "<アカウント ID>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+#, fuzzy
+msgid "Show account assistant"
+msgstr "アカウント・ダイアログを表示する"
+
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
 msgstr "- Empathy のアカウント"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
 msgstr "Empathy のアカウント"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr ""
 
-#: ../src/empathy-debugger.c:75
-#, fuzzy
-#| msgid "Empathy Debugger"
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
-msgstr "Empathy デバッガー"
+msgstr "- Empathy デバッガー"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy デバッガー"
 
 #: ../src/empathy-chat.c:107
-#, fuzzy
-#| msgid "- Empathy IM Client"
 msgid "- Empathy Chat Client"
-msgstr "- Empathy インスタント・メッセンジャー"
+msgstr "- Empathy チャットクライアント"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "応答する"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "拒否"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "応答"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
-msgstr ""
+msgstr "ビデオで応答"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "お断り"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "受け取る"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:247
 #, fuzzy
-#| msgid "Preview"
 msgid "Provide"
 msgstr "プレビュー"
 
 #: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
+msgstr "%s が呼び出そうとしましたが、あなたは別の通話中でした。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr ""
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
-msgstr ""
+msgstr "ミュート"
 
-#: ../src/empathy-call-window.c:2732
-#, fuzzy
-#| msgid "Location"
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
-msgstr "場所"
+msgstr "通話時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
-#, fuzzy, c-format
-#| msgid "Connected — %d:%02dm"
+#: ../src/empathy-call-window.c:2937
+#, c-format
 msgid "%s — %d:%02dm"
-msgstr "接続しました — %d分%02d秒"
+msgstr "%s — %d分%02d秒"
+
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "現在の残高は %s です。"
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "残高が不足しているため、通話できません。"
+
+#: ../src/empathy-call-window.c:3213
+msgid "Top Up"
+msgstr ""
 
 #: ../libempathy-gtk/empathy-search-bar.c:243
-#, fuzzy
-#| msgid "Match case"
 msgid "_Match case"
-msgstr "大文字小文字を区別して一致"
+msgstr "大文字小文字を区別する(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "新しいアカウントの追加"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人の情報"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "リンク中の相手先"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "リンクする連絡先の選択"
+
+#~ msgid "New contact preview"
+#~ msgstr "新しい相手先をプレビュー"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "左の一覧で選択した相手先は互いにリンクしています"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "相手先をリンク(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "相手先をリンク"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "リンクを外す(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "表示しているメタ相手先を、個別の相手先に完全に分離します。"
+
+#~ msgid "_Link"
+#~ msgstr "リンク(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "メタ相手先 '%s' のリンクを外しますか?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "このメタ相手先のリンクを外しますか? メタ相手先を、個別の相手先に完全に分離"
+#~ "します。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "リンクを外す(_U)"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人情報(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "新しいチャットごとに別のウィンドウを開く(_O)"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy は butterfly のログを移行しました"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy が butterfly のログを移行したかどうか。"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "サポートされていないソケットタイプです"
+
+#, fuzzy
+#~| msgid "Empathy Accounts"
+#~ msgid "My Web Accounts"
+#~ msgstr "Empathy のアカウント"
+
+#, fuzzy
+#~| msgid "Empathy Accounts"
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Empathy のアカウント"
+
+#, fuzzy
+#~| msgid "_Edit"
+#~ msgid "Edit %s"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "中止(_N)"
+
+#~ msgid "Ungrouped"
+#~ msgstr "グループ無所属"
+
+#~ msgid "Favorite People"
+#~ msgstr "お気に入りの人達"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "編集(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "連絡先の選択"
+
+#~ msgid "Contact ID:"
+#~ msgstr "仲間の ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "チャット(_H)"
+
+#~ msgid "Send _Video"
+#~ msgstr "映像の送信(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "呼び出す(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "在席中にし現在の状態を設定する"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "選択した仲間はファイルを受信できません。"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "選択した仲間はオフラインです。"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "変更を破棄して新しいアカウントを生成しようとしています。\n"
+#~ "本当に継続しますか?"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "不明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "不明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "不明"
+
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "不明"
 
 #~ msgid "All"
 #~ msgstr "すべて"
@@ -5016,9 +5048,6 @@ msgstr "大文字小文字を区別して一致"
 #~ msgid "Set your own presence"
 #~ msgstr "あなたの在席情報をセットします"
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "アカウント・ダイアログを表示する"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "エラーメッセージ: <span style=\"italic\">%s</span>"
 
diff --git a/po/ko.po b/po/ko.po
index 92dd59ceb..2e221a3af 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,6 +2,7 @@
 # This file is distributed under the same license as the empathy package.
 #
 # Changwoo Ryu <cwryu@debian.org>, 2008, 2009, 2010, 2011.
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2012.
 #
 # 새로 번역하시는 분은 아래 "translator-credits"에 추가하세요.
 #
@@ -33,9 +34,9 @@ msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-10-14 17:48+0000\n"
-"PO-Revision-Date: 2011-10-17 03:03+0900\n"
-"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
+"POT-Creation-Date: 2012-03-09 09:48+0000\n"
+"PO-Revision-Date: 2012-03-10 16:50+0900\n"
+"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -44,487 +45,539 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "구글 토크, 페이스북, MSN 및 기타 대화 서비스에서 대화"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "엠퍼시"
 
+# IM은 메신저라고 번역
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "메신저 클라이언트"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "엠퍼시 인터넷 메신저"
 
-# IM은 메신저라고 번역
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "메신저 클라이언트"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "구글 토크, 페이스북, MSN 및 기타 대화 서비스에서 대화"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "메신저 및 VoIP 계정"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "메신저 및 VoIP 계정 관리"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "새로운 대화는 항상 별도의 대화 표시창에 엽니다."
+msgid "Connection managers should be used"
+msgstr "연결 관리자를 사용합니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "통화 볼륨"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "연결 관리자를 이용해 연결을 자동으로 끊고 다시 연결할 지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "통화 볼륨, 퍼센트 값."
+msgid "Empathy should auto-connect on startup"
+msgstr "엠퍼시 시작할 때 자동 연결"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "카메라 장치"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "엠퍼시가 시작할 때 계정에 자동 로그인할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "카메라 위치"
+msgid "Empathy should auto-away when idle"
+msgstr "엠퍼시에서 입력이 없으면 자리 비움"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "그룹 대화에서 자동 완성을 (Tab 키) 사용할 경우 대화명 뒤에 붙일 문자."
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "사용자 입력이 없을 때 엠퍼시가 자리 비움 모드로 전환할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "대화 표시창 테마"
+msgid "Empathy default download folder"
+msgstr "엠퍼시 기본 다운로드 폴더"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "대화 표시창 테마 변종"
+msgid "The default folder to save file transfers in."
+msgstr "전송 받은 파일을 저장할 기본 폴더."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"맞춤법 검사에서 사용할 언어의 목록, 쉼표로 구분 (예를 들어 \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "매직 넘버는 완전 소거 작업을 실행해야 하는지를 점검할 때 사용합니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "간략한 연락처 목록"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c 는 소거 작업을 실행해야 하는지를 검사하기 위해 이 "
+"숫자를 사용합니다. 사용자가 이 키를 직접 바꾸지 않는 것이 좋습니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "연결 관리자를 사용합니다"
+msgid "Show offline contacts"
+msgstr "연결 중지 상태 연락처 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "연락처 목록 정렬 기준"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "연락처 목록에 연결 중지 상태의 연락처를 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "영상 통화에 사용할 기본 카메라 장치, 예를 들어 /dev/video0."
+msgid "Show avatars"
+msgstr "아바타 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "아바타 그림을 선택할 기본 디렉터리"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "연락처 목록과 대화 표시창에 연락처의 아바타를 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "자리 비움일 때 팝업 알림 사용하지 않기"
+msgid "Show protocols"
+msgstr "프로토콜 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "자리 비움일 때 소리 사용하지 않기"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "연락처 목록에 연락처의 프로토콜을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "상태 영역에 새로 들어온 이벤트 표시"
+msgid "Show Balance in contact list"
+msgstr "연락처 목록에 잔액 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"상태 영역에 새로 들어온 이벤트를 표시합니다. 거짓이면 사용자에게 즉시 이벤트"
-"를 알립니다."
+msgid "Whether to show account balances in the contact list."
+msgstr "연락처 목록에 계정 잔액을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "음향 반향 제거 기능"
+msgid "Compact contact list"
+msgstr "간략한 연락처 목록"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "사용자의 위치를 공개할 수 있습니다"
+msgid "Whether to show the contact list in compact mode."
+msgstr "연락처 목록을 간략하게 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "GPS를 이용해 위치를 파악할 수 있습니다"
+msgid "Hide main window"
+msgstr "메인 창 감추기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "휴대전화 네트워크를 사용해 위치를 파악할 수 있습니다"
+msgid "Hide the main window."
+msgstr "메인 창을 감춥니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "네트워크를 사용해 위치를 파악할 수 있습니다"
+msgid "Default directory to select an avatar image from"
+msgstr "아바타 그림을 선택할 기본 디렉터리"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "엠퍼시 기본 다운로드 폴더"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "최근에 아바타 그림을 선택한 디렉터리."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "엠퍼시에서 버터플라이 기록을 가져옴"
+msgid "Open new chats in separate windows"
+msgstr "새로운 대화는 별도 창에 열기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "엠퍼시에서 입력이 없으면 자리 비움"
+msgid "Always open a separate chat window for new chats."
+msgstr "새로운 대화는 항상 별도의 대화 표시창에 엽니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "엠퍼시 시작할 때 자동 연결"
+msgid "Display incoming events in the status area"
+msgstr "상태 영역에 새로 들어온 이벤트 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "위치를 부정확하게 만듭니다"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"상태 영역에 새로 들어온 이벤트를 표시합니다. 거짓이면 사용자에게 즉시 이벤트"
+"를 알립니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "엠퍼시 대화 표시창의 아이콘으로 연락처의 아바타 사용"
+msgid "The position for the chat window side pane"
+msgstr "대화 가장자리 창의 위치"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "웹키트 개발 도구 사용"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "대화 가장자리 창의 저장한 위치 (픽셀 단위)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "새 메시지에 팝업 알림 사용"
+msgid "Show contact groups"
+msgstr "연락처 그룹 보이기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "맞춤법 검사 사용"
+msgid "Whether to show groups in the contact list."
+msgstr "연락처 목록에 그룹을 보일지에 대한 여부입니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "메인 창 감추기"
+msgid "Contact list sort criterion"
+msgstr "연락처 목록 정렬 기준"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "메인 창을 감춥니다."
+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 ""
+"연락처 목록을 정렬할 때 사용할 기준입니다. 기본값은 \"상태\" 값에 따른 연락처"
+"의 상태순으로 정렬합니다. \"name\"이라고 하면 이름순으로 정렬합니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "대화명 완성 문자"
+msgid "Use notification sounds"
+msgstr "알리는 소리 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "새로운 대화는 별도 창에 열기"
+msgid "Whether to play a sound to notify of events."
+msgstr "이벤트를 알릴 때 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "사용할 에이디엄 테마의 경로"
+msgid "Disable sounds when away"
+msgstr "자리 비움일 때 소리 사용하지 않기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "사용할 에이디엄 테마의 경로, 대화에 사용할 테마가 아디움일 경우."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "자리 비움이거나 다른 용무 중일 때 알림 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "메시지를 받으면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "새 대화 내용이 있으면 소리 내기"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "메시지를 받으면 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "메시지를 보내면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "연락처의 누군가가 로그인하면 소리 내기"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "메시지를 보내면 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "연락처의 누군가가 로그아웃하면 소리 내기"
+msgid "Play a sound for new conversations"
+msgstr "새 대화 내용이 있으면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "로그인하면 소리 내기"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "새 대화 내용이 있으면 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "로그아웃하면 소리 내기"
+msgid "Play a sound when a contact logs in"
+msgstr "연락처의 누군가가 로그인하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "대화에 포커스가 없으면 팝업 알림"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "연락처의 누군가가 네트워크에 로그인할 때 알림 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "연락처에 있는 사람이 들어오면 팝업 알림"
+msgid "Play a sound when a contact logs out"
+msgstr "연락처의 누군가가 로그아웃하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "연락처에 있는 사람이 나가면 팝업 알림"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "연락처의 누군가가 네트워크에서 로그아웃할 때 알림 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "통화 중에 카메라 미리 보기의 위치."
+msgid "Play a sound when we log in"
+msgstr "로그인하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "연락처 목록에 잔액 표시"
+msgid "Whether to play a sound when logging into a network."
+msgstr "네트워크에 로그인할 때 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "아바타 표시"
+msgid "Play a sound when we log out"
+msgstr "로그아웃하면 소리 내기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "방에 연락처 목록 표시"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "네트워크에서 로그아웃할 때 소리를 낼지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "메인 창을 닫을 때 안내를 표시합니다."
+msgid "Enable popup notifications for new messages"
+msgstr "새 메시지에 팝업 알림 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "연결 중지 상태 연락처 표시"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "새 메시지를 받았을 때 팝업 알림 창을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "프로토콜 표시"
+msgid "Disable popup notifications when away"
+msgstr "자리 비움일 때 팝업 알림 사용하지 않기"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "맞춤법 검사 언어"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "자리 비움이거나 다른 용무 중일 때 팝업 알림 창을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "전송 받은 파일을 저장할 기본 폴더."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "대화에 포커스가 없으면 팝업 알림"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "최근에 아바타 그림을 선택한 디렉터리."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"대화를 열었지만 포커스가 없을 경우에도 새 메시지를 받았을 때 팝업 알림 창을 "
+"표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "대화 가장자리 창의 위치"
+msgid "Pop up notifications when a contact logs in"
+msgstr "연락처에 있는 사람이 들어오면 팝업 알림"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "대화 가장자리 창의 저장한 위치 (픽셀 단위)."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "연락처의 사람이 연결하면 팝업 알림 창을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "대화 표시창에서 대화 내용을 표시하는데 사용하는 테마."
+msgid "Pop up notifications when a contact logs out"
+msgstr "연락처에 있는 사람이 나가면 팝업 알림"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "대화 표시창에서 대화 내용을 표시하는데 사용하는 테마 변종."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "연락처의 사람이 연결이 끊어지면 팝업 알림 창을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "그래픽 이모티콘 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "알리는 소리 사용"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "대화 내용에 있는 이모티콘을 그림으로 바꿔 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "대화방에 테마 사용"
+msgid "Show contact list in rooms"
+msgstr "방에 연락처 목록 표시"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "사용자의 위치를 연락처에 있는 사람들에게 공개할지 여부."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "대화방에 연락처 목록을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "GPS를 이용해 위치를 파악할지 여부."
+msgid "Chat window theme"
+msgstr "대화 표시창 테마"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "휴대전화 네트워크를 이용해 위치를 파악할지 여부."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "대화 표시창에서 대화 내용을 표시하는데 사용하는 테마."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "네트워크를 이용해 위치를 파악할지 여부."
+msgid "Chat window theme variant"
+msgstr "대화 표시창 테마 변종"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "엠퍼시에서 버터플라이 기록을 가져왔는지 여부."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "대화 표시창에서 대화 내용을 표시하는데 사용하는 테마 변종."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "엠퍼시가 시작할 때 계정에 자동 로그인할지 여부."
+msgid "Path of the Adium theme to use"
+msgstr "사용할 에이디엄 테마의 경로"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "사용자 입력이 없을 때 엠퍼시가 자리 비움 모드로 전환할지 여부."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "사용할 에이디엄 테마의 경로, 대화에 사용할 테마가 아디움일 경우."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "개인 정보 보호를 위해 위치를 부정확하게 만들지 여부."
+msgid "Enable WebKit Developer Tools"
+msgstr "웹키트 개발 도구 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "엠퍼시의 대화 표시창 아이콘으로 연락처의 아바타를 사용할지 여부."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "웹키트 개발 툴을 (Web Inspector 따위) 사용할지 여부."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "다른 사용자에게 내용을 전달하려면 알려주십시오"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "연결 관리자를 이용해 연결을 자동으로 끊고 다시 연결할 지 여부."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"'작성중' 또는 '멈춤' 대화상태를 보낼지에 대한 여부입니다. 현재 '보냄' 상태에 "
+"대해서는 영향을 주지 않습니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "설정한 언어에 따라 입력하는 중에 단어의 맞춤법을 검사할지 여부."
+msgid "Use theme for chat rooms"
+msgstr "대화방에 테마 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "대화 내용에 있는 이모티콘을 그림으로 바꿔 표시할지 여부."
+msgid "Whether to use the theme for chat rooms."
+msgstr "대화방에 테마를 사용할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "펄스오디오의 음향 반향 제거 기능 사용 여부."
+msgid "Spell checking languages"
+msgstr "맞춤법 검사 언어"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "연락처의 누군가가 네트워크에 로그인할 때 알림 소리를 낼지 여부."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"맞춤법 검사에서 사용할 언어의 목록, 쉼표로 구분 (예를 들어 \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "연락처의 누군가가 네트워크에서 로그아웃할 때 알림 소리를 낼지 여부."
+msgid "Enable spell checker"
+msgstr "맞춤법 검사 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "이벤트를 알릴 때 소리를 낼지 여부."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "설정한 언어에 따라 입력하는 중에 단어의 맞춤법을 검사할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "메시지를 받으면 소리를 낼지 여부."
+msgid "Nick completed character"
+msgstr "대화명 완성 문자"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "새 대화 내용이 있으면 소리를 낼지 여부."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "그룹 대화에서 자동 완성을 (Tab 키) 사용할 경우 대화명 뒤에 붙일 문자."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "메시지를 보내면 소리를 낼지 여부."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "엠퍼시 대화 표시창의 아이콘으로 연락처의 아바타 사용"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "네트워크에 로그인할 때 소리를 낼지 여부."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "엠퍼시의 대화 표시창 아이콘으로 연락처의 아바타를 사용할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "네트워크에서 로그아웃할 때 소리를 낼지 여부."
+msgid "Last account selected in Join Room dialog"
+msgstr "방 참여 대화상자에서 선택한 최근 계정"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "자리 비움이거나 다른 용무 중일 때 알림 소리를 낼지 여부."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "방에 참여하기 위헤 선택한 최근 계정의 D-Bus 객체 경로입니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "연락처의 사람이 연결이 끊어지면 팝업 알림 창을 표시할지 여부."
+msgid "Camera device"
+msgstr "카메라 장치"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "연락처의 사람이 연결하면 팝업 알림 창을 표시할지 여부."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "영상 통화에 사용할 기본 카메라 장치, 예를 들어 /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"대화를 열었지만 포커스가 없을 경우에도 새 메시지를 받았을 때 팝업 알림 창을 "
-"표시할지 여부."
+msgid "Camera position"
+msgstr "카메라 위치"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "새 메시지를 받았을 때 팝업 알림 창을 표시할지 여부."
+msgid "Position the camera preview should be during a call."
+msgstr "통화 중에 카메라 미리 보기의 위치."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "연락처 목록에 계정 잔액을 표시할지 여부."
+msgid "Echo cancellation support"
+msgstr "음향 반향 제거 기능"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "연락처 목록과 대화 표시창에 연락처의 아바타를 표시할지 여부."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "펄스오디오의 음향 반향 제거 기능 사용 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "연락처 목록에 연결 중지 상태의 연락처를 표시할지 여부."
+msgid "Show hint about closing the main window"
+msgstr "메인 창을 닫을 때 안내를 표시합니다."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "자리 비움이거나 다른 용무 중일 때 팝업 알림 창을 표시할지 여부."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"제목 표시줄의 'x' 단추로 메인 창을 닫을 때 알림 대화 창을 표시할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "연락처 목록에 연락처의 프로토콜을 표시할지 여부."
+msgid "Empathy can publish the user's location"
+msgstr "사용자의 위치를 공개할 수 있습니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "대화방에 연락처 목록을 표시할지 여부."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "사용자의 위치를 연락처에 있는 사람들에게 공개할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "연락처 목록을 간략하게 표시할지 여부."
+msgid "Empathy can use the network to guess the location"
+msgstr "네트워크를 사용해 위치를 파악할 수 있습니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"제목 표시줄의 'x' 단추로 메인 창을 닫을 때 알림 대화 창을 표시할지 여부."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "네트워크를 이용해 위치를 파악할지 여부."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "대화방에 테마를 사용할지 여부."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "휴대전화 네트워크를 사용해 위치를 파악할 수 있습니다"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "휴대전화 네트워크를 이용해 위치를 파악할지 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "GPS를 이용해 위치를 파악할 수 있습니다"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "GPS를 이용해 위치를 파악할지 여부."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "위치를 부정확하게 만듭니다"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
-msgstr ""
-"연락처 목록을 정렬할 때 사용할 기준. 기본값은 \"name\"으로 연락처의 이름에 따"
-"라 정렬합니다. \"state\"라고 하면 상태에 따라 정렬합니다."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "개인 정보 보호를 위해 위치를 부정확하게 만들지 여부."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "메신저 및 VoIP 계정 관리"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "이유를 지정하지 않았습니다"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "메신저 및 VoIP 계정"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "상태 바꾸기를 요청했습니다"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "파일 전송을 취소했습니다"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "상대가 파일 전송을 취소했습니다"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "파일을 전송하는 중에 오류가 발생했습니다"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "상대가 파일을 전송할 수 없습니다"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "알 수 없는 이유"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "파일 전송 완료되었지만, 파일이 손상되어 있습니다"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "원격 상대 측에서 파일 전송을 지원하지 않습니다"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "선택한 파일은 일반 파일이 아닙니다"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "선택한 파일이 빈 파일입니다"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s에서 온 놓친 호출"
@@ -540,169 +593,138 @@ msgstr "호출함: %s"
 msgid "Call from %s"
 msgstr "호출 받음: %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "이 소켓 종류를 지원하지 않습니다"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "이유를 지정하지 않았습니다"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "상태 바꾸기를 요청했습니다"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "파일 전송을 취소했습니다"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "상대가 파일 전송을 취소했습니다"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "파일을 전송하는 중에 오류가 발생했습니다"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "상대가 파일을 전송할 수 없습니다"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "알 수 없는 이유"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "대화 가능"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "다른 용무 중"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "자리 비움"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "상태 감춤"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "연결 중지"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "이유를 지정하지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "상태가 연결 중지로 설정되었습니다"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "네트워크 오류"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "인증 실패"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "암호화 오류"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "이름이 사용 중입니다"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "인증서가 없습니다"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "인증서를 신뢰할 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "인증서가 만료되었습니다"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "인증서를 활성화하지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "인증서 호스트 이름이 맞지 않습니다"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "인증서 핑거프린트가 맞지 않습니다"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "자기만 서명한 인증서입니다"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "인증서 오류"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "암호화를 사용할 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "인증서가 올바르지 않습니다"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "연결이 거부되었습니다"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "연결이 완료되지 않았습니다"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "연결이 끊어졌습니다"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "이 리소스는 이미 서버와 연결되어 있습니다"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "이 계정은 이미 서버와 연결했습니다"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "기존 연결이 같은 리소스를 사용해 새롭게 연결되었습니다"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "서버에 해당 계정이 이미 있습니다"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "서버가 사용량이 너무 많아 연결을 받아들일 수 없습니다"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "인증서가 철회되었습니다"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "인증서가 안전하지 않은 암호화 알고리즘을 사용하거나 암호화가 취약합니다"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -710,277 +732,256 @@ msgstr ""
 "서버 인증서의 길이 혹은 서버 인증서 체인의 단계가 암호화 라이브러리가 지정한 "
 "한계를 넘아갔습니다"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "여러분의 소프트웨어가 너무 오래되었습니다"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "내부 오류"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "주변 사람"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "야후! 일본"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "구글 토크"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "페이스북 대화"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d초 전"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d분 전"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d시간 전"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d일 전"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d주 전"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d달 전"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "미래"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "모든 계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "암호"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "서버"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "포트"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "내 웹 계정"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s 계정은 %s을(를) 통해 편집했습니다."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s 계정은 엠퍼시에서 편집할 수 없습니다."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "내 웹 계정 실행"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "%s 편집"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "사용자 이름:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "적용(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "로그인(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "서버에 이 계정이 이미 있습니다"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "서버에 새 계정 만들기"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "취소(_N)"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s (서버 %2$s)"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 계정"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "새 계정"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>예:</b> 내대화명"
+#: ../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:"
+msgstr "암호(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "고급"
+msgid "Screen _Name:"
+msgstr "대화명(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>예:</b> 내대화명"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "암호(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "암호 저장"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "암호 저장"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "포트(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "암호 저장"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "대화명(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "서버(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIM 암호가 무엇입니까?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "고급"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "AIM 아이디가 무엇입니까?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "포트(_P):"
+msgid "What is your AIM password?"
+msgstr "AIM 암호가 무엇입니까?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "서버(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>예:</b> 사용자이름"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "암호 저장"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "로그인 아이디(_D):"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>예:</b> 사용자이름"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "그룹와이즈 사용자 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "그룹와이즈 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ 사용자 번호(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>예:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "문자 인코딩(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ 사용자 번호(_U):"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ICQ 사용자 번호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ICQ 암호가 무엇입니까?"
 
@@ -1019,11 +1020,23 @@ msgstr "Options"
 msgid "None"
 msgstr "없음"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "네트워크"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "네트워크:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "문자 인코딩:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "서버"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1031,14 +1044,6 @@ msgstr ""
 "대부분 IRC 서버는 암호가 필요 없습니다. 그러므로 잘 모르겠으면 암호를 입력하"
 "지 마십시오."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "네트워크"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "네트워크:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "대화명:"
@@ -1055,48 +1060,20 @@ msgstr "나갈 때 메시지:"
 msgid "Real name:"
 msgstr "실제 이름:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "서버"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "IRC 대화명이 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "어느 IRC 네트워크입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>예:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>예:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "암호화 필요(_Y) (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL 인증서 오류 무시(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "서버 설정 무시"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "우선 순위(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "IRC 대화명이 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "자원(_U):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "페이스북 사용자 이름이 무엇입니까?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1109,180 +1086,204 @@ msgstr ""
 "사용자 이름이 없다면 <a href=\"http://www.facebook.com/username/\">이 페이지"
 "</a>에서 페이스북 사용자 이름을 설정하십시오."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "과거 SSL 사용(_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "페이스북 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "페이스북 사용자 이름이 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "구글 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>예:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "구글 암호가 무엇입니까?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>예:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL 인증서 오류 무시(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "우선 순위(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "자원(_U):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "암호화 필요(_Y) (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "과거 SSL 사용(_L)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "서버 설정 무시"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "재버 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "재버 암호가 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "희망하는 재버 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "재버 암호가 무엇입니까?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "희망하는 재버 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>예:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "윈도우 라이브 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "윈도우 라이브 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "전자메일 주소(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "대화명(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "성(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "이름(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "공개 이름(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "재버 아이디(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "성(_L):"
+msgid "E-_mail address:"
+msgstr "전자메일 주소(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "공개 이름(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "사용자 이름(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>예:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "인증 사용자 이름:"
-
-# NAT traversal 관련
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "바인딩 검색"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "자동으로 STUN 서버 검색"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "이 계정을 사용해 유선 전화나 휴대 전화로 통화(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS 오류 무시"
+msgid "NAT Traversal Options"
+msgstr "NAT 통과 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "간격 (초 단위)"
+msgid "Proxy Options"
+msgstr "프록시 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "연결 유지 옵션"
+msgid "Miscellaneous Options"
+msgstr "기타 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "느슨한 라우팅"
+msgid "STUN Server:"
+msgstr "STUN 서버:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "방식:"
+msgid "Discover the STUN server automatically"
+msgstr "자동으로 STUN 서버 검색"
 
+# NAT traversal 관련
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "기타 옵션"
+msgid "Discover Binding"
+msgstr "바인딩 검색"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 통과 옵션"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "서버:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "연결 유지 옵션"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "포트:"
+msgid "Mechanism:"
+msgstr "방식:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "프록시 옵션"
+msgid "Interval (seconds)"
+msgstr "간격 (초 단위)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "인증 사용자 이름:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "전송 방법:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN 서버:"
+msgid "Loose Routing"
+msgstr "느슨한 라우팅"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "서버:"
+msgid "Ignore TLS Errors"
+msgstr "TLS 오류 무시"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "전송 방법:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "이 계정을 사용해 유선 전화나 휴대 전화로 통화(_L)"
+msgid "Port:"
+msgstr "포트:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "SIP 계정 암호가 무엇입니까?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "SIP 로그인 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "사용자 이름(_U):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "SIP 계정 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "야후! 아이디(_D):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "회의 및 대화방 초대 무시(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "방 목록 로캘(_R):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "야후! 아이디가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "야후! 암호가 무엇입니까?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "야후! 아이디(_D):"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "방 목록 로캘(_R):"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1320,61 +1321,65 @@ msgstr "모든 파일"
 msgid "Click to enlarge"
 msgstr "누르면 크게 봅니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "통화를 시작하는데 오류가 발생했습니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "지정한 계정은 통화를 지원하지 않습니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "지정한 연락처는 연결 중지 상태입니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "지정한 연락처는 올바르지 않습니다"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "이 프로토콜에서는 비상 통화를 지원하지 않습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "연락을 하기 위한 잔고가 부족합니다"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "개인 대화를 시작하는데 실패했습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "이 대화에서는 주제 설정을 지원하지 않습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "주제를 바꿀 권한이 없습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s”은(는) 올바른 연락처의 아이디가 아닙니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: 현재 대화의 모든 메시지를 지웁니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <주제>: 현재 대화의 주제를 설정합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <대화방아이디>: 새 대화방에 입장합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <대화방아이디>: 새 대화방에 참여합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1382,23 +1387,23 @@ msgstr ""
 "/part [<대화방아이디>] [<이유>]: 대화방을 떠납니다. 기본값은 현재 대화방을 떠"
 "납니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <연락처아이디> [<메시지>]: 개인 대화를 시작합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <연락처아이디> [<메시지>]: 개인 대화를 시작합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <대화명>: 서버에서 대화명을 바꿉니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <메시지>: 현재 대화에서 ACTION 메시지를 보냅니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1408,11 +1413,11 @@ msgstr ""
 "지를 보낼 때 사용합니다. 예를 들어: \"/say /join 명령으로 대화방에 입장합니다"
 "\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <대화명>: 대화 상대에 대한 정보를 표시합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1420,113 +1425,127 @@ msgstr ""
 "/help [<명령어>]: 명령어 목록을 표시합니다. <명령어>가 있으면 해당 명령어 사"
 "용법을 표시합니다."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "사용법: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "알 수 없는 명령어"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "알 수 없는 명령어. 명령어 목록은 /help 명령에서 보십시오"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "메시지를 보내는데 필요한 잔액이 부족합니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "메시지를 보내는데 오류, '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "메시지를 보내는데 오류: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"메시지를 보내는데 필요한 잔액이 부족합니다. <a href='%s'>위로 올립니다</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "권한 없음"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "연결 중지"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "연락처가 잘못되었습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "권한이 없습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "메시지가 너무 깁니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "구현하지 않았습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "알 수 없음"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "메시지를 보내는데 오류, '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "메시지를 보내는데 오류: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "주제:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "주제를 설정했습니다: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s이(가) 주제를 설정했습니다: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "주제를 정하지 않았습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(제안 없음)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "사전에 '%s' 추가"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "%2$s 사전에 '%1$s' 추가"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "이모티콘 입력"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "보내기(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "맞춤법 제안(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "최근 기록을 가져오는데 실패했습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 님의 연결이 끊겼습니다"
@@ -1534,12 +1553,12 @@ msgstr "%s 님의 연결이 끊겼습니다"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 님이 %2$s 님에 의해 퇴장당했습니다."
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%1$s 님이 퇴장당했습니다."
@@ -1547,17 +1566,17 @@ msgstr "%1$s 님이 퇴장당했습니다."
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 님이 %2$s 님에 의해 입장 금지됐습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s 님이 입장 금지됐습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 님이 방을 떠났습니다"
@@ -1567,17 +1586,17 @@ msgstr "%s 님이 방을 떠났습니다"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 님이 방에 들어왔습니다"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 님의 대화명은 이제부터 %s 입니다"
@@ -1585,90 +1604,90 @@ msgstr "%s 님의 대화명은 이제부터 %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:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "연결 끊김"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "이 암호를 저장하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "저장"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "지금 안 함"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "다시 시도"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "암호가 틀렸습니다. 다시 시도해 보십시오:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "이 방은 암호가 설정되어 있습니다:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "입장"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "연결함"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "대화"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (단문 문자)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "아이디를 알 수 없거나 아이디가 올바르지 않습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "연락처 차단을 임시로 사용할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "연락처 차단을 사용할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "권한이 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "연락처를 차단할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "차단 연락처 편집"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "계정:"
 
@@ -1678,462 +1697,367 @@ msgstr "차단한 연락처"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "제거"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "링크 주소 복사(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "링크 열기(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%Y년 %B %d일 %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "연락처 정보 편집"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "개인 정보"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "새 연락처"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s 차단하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "'%s' 사용자가 연락하지 못하도록 차단하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "차단(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "이 연락처를 불량 사용자로 신고(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "나중에 결정(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "가입 요청"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "사용자 차단(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "그룹 없음"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "자주 연락하는 사람"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "정말로 '%s' 그룹을 지우시겠습니까?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "그룹 지우기"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "제거(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "정말로 '%s' 연락처를 지우시겠습니까?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "연락처를 지웁니다"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "연락처 추가(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "연락처 차단(_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "대화(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "음성 호출(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "영상 호출(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "예전 대화(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "파일 보내기"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "내 데스크톱 공유"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "즐겨 찾기"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "정보(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "편집(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "이 방에 초대"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "대화방에 초대(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "나중에 결정(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "연락처 검색"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "검색: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "연락처 추가(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "연락처가 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "나에 대해 소개하는 메시지:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "연결하면 제게 연락해 주세요. 감사합니다!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "연락처 선택"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "전체 이름:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "전화번호:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "전자메일 주소:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "웹사이트:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "생일:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "최근 본 때:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "연결 받음, 위치:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "자리 비움 메시지:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "채널 수:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO 국가 코드:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "국가:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "지역:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "도시:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "구역:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "우편번호:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "길:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "건물:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "층수:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "방:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "간판:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "설명:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "정확도:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "오류:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "수직 오차 (미터):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "수평 오차 (미터):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "속도:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "관계:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "상승 속도:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "최근 업데이트 시각:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "경도:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "위도:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "고도:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "위치"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%Y년 %B %e일 %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "아바타 저장"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "아바타를 저장할 수 없습니다"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>위치</b> (날짜별)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "별명:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "클라이언트 정보"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "클라이언트:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "개인 상세정보"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "연락처 자세히"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "전체 이름"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "전화번호"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "전자메일 주소"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "웹사이트"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "생일"
+
+#. 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 "최근 본 때:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "연결 받은 위치:"
+
+#. 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 "자리 비움 메시지:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "직장"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "집"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "휴대전화"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "음성"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "선호사항"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "우편"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "소포"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "아이디:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "별명:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>위치</b> (날짜별)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "요청한 정보…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "클라이언트 정보"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "운영 체제:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "버전:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "클라이언트:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "그룹"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2141,103 +2065,168 @@ msgstr ""
 "이 연락처가 나타날 그룹을 고르십시오. 여러 개의 그룹을 고를 수도 있고 그룹을 "
 "고르지 않을 수도 있습니다."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "그룹 추가(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "선택"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "그룹"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "다음 아이디를 차단할 예정입니다:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "다음 아이디를 차단할 수 없습니다:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "연결할 연락처"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "연결할 연락처 선택"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "새 연락처 미리 보기"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "왼쪽의 목록에서 선택한 연락처를 서로 연결합니다."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "연락처 정보 편집"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "통화를 할 때 사용할 계정 선택"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "호출"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "휴대전화"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "직장"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "집"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "연락처 차단(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "대화(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "단문 문자(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "음성 호출(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "영상 호출(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "예전 대화(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "파일 보내기"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "내 데스크톱 공유"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "즐겨 찾기"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts를 설치하지 않았습니다"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "자세한 연락처를 보려면 gnome-contacts를 설치하여 주십시오."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "정보(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "편집(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "연락처 연결(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "이 방에 초대"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "대화방에 초대(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "연락처 추가(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "삭제 및 차단(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "정말로 '%s' 그룹을 지우시겠습니까?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "그룹 지우기"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "제거(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "정말로 '%s' 연락처를 지우시겠습니까?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2246,7 +2235,11 @@ msgstr ""
 "정말로 연결된 '%s' 연락처를 제거하시겠습니까? 그러면 연결된 항목에 들어 있는 "
 "모든 연락처가 지워집니다."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "연락처를 지웁니다"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2256,23 +2249,23 @@ msgstr[0] "%u개 연락처가 들어 있는 연결된 연락처"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>위치</b> (날짜별)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "전화 및 휴대전화 장치에서 연결"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "새 네트워크"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC 네트워크 선택"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "네트워크 목록 초기화(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "선택"
@@ -2285,246 +2278,249 @@ msgstr "새 서버"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "연락처 연결"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "연결 해제(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "연결된 연락처를 완전히 별도의 연락처로 나눕니다."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "연결(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "연결된 '%s' 연락처의 연결을 해제하시겠습니까?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"정말로 이 연결된 연락처의 연결을 해제하시겠습니까? 그러면 연결된 연락처를 여"
-"러 개의 별개 연락처로 나눕니다."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "연결 해제(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "기록"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "보이기"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "검색"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "대화, 장소: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "대화, 상대: %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y년 %B %e일 %A, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s초"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s분"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "통화 시간 %s, 종료 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "오늘"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "어제"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y년 %B %e일"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "모든 시간"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "모든 상대"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "상대"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "시간"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "모두"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "텍스트 채팅"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "받은 통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "보낸 통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "놓친 통화"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "내용"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "정말로 이전 대화 기록을 삭제하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "모두 지우기"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "삭제할 곳:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">읽어들이는 중...</span>"
+msgid "_File"
+msgstr "파일(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "대화"
+#: ../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 "편집(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "모든 기록 삭제..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "프로파일"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "영상"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "대화"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "편집(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "영상"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "파일(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "페이지 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "연락처 아이디:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">읽어들이는 중...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "연락처는 연결 중지 상태입니다"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "대화(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "지정한 연락처가 올바르지 않거나 알 수 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "연락처에서는 이 대화의 종류를 지원하지 않습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "요청한 기능은 이 프로토콜에서 지원하지 않습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "주어진 연락처로 대화를 시작할 수 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "이 채널에서 추방되었습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "이 채널은 가득 찼습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "이 채널에 참여하려면 초대받아야 합니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "연결을 끊는 동안 수행할 수 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "권한이 없습니다"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "대화를 시작하는 중 오류가 발생했습니다"
+
+#: ../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 "연락처 식별자나 전화 번호를 입력하십시오:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "새 대화"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "영상 보내기(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "영상 호출(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "호출(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "음성 호출(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "새 호출"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<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"
@@ -2561,12 +2557,8 @@ msgstr "이 상태를 선호하는 값으로 하려면 누르십시오"
 msgid "Set status"
 msgstr "상태 설정"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "현재 상태를 설정합니다"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "사용자 지정 메시지…"
 
@@ -2574,7 +2566,7 @@ msgstr "사용자 지정 메시지…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "새 %s 계정"
@@ -2584,20 +2576,20 @@ msgid "Find:"
 msgstr "찾기:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "대소문자 구별(_C)"
+msgid "_Previous"
+msgstr "이전(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "찾지 못했습니다"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "다음(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "대소문자 구별(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "이전(_P)"
+msgid "Phrase not found"
+msgstr "찾지 못했습니다"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2644,12 +2636,12 @@ msgid "Edit Custom Messages"
 msgstr "사용자 설정 메시지 편집"
 
 # 상태 메시지
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "메시지 편집, %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "보통"
 
@@ -2725,34 +2717,38 @@ msgid "Certificate hostname: %s"
 msgstr "인증서 호스트 이름: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "계속"
+msgid "C_ontinue"
+msgstr "계속(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "신뢰할 수 없는 연결"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "연결을 신뢰할 수 없습니다. 그래도 계속 하시겠습니까?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "앞으로 연결할 때 이렇게 선택"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "인증서 상세 정보"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "URI를 열 수 없습니다"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "파일을 선택하십시오"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "파일을 저장할 빈 공간이 부족합니다"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2761,7 +2757,7 @@ msgstr ""
 "이 파일을 저장하려면 %s 만큼의 빈 공간이 필요하지만, 남은 용량은 %s입니다. 다"
 "른 위치를 선택하십시오."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s에서 온 파일"
@@ -2933,40 +2929,32 @@ msgstr "서양 언어"
 msgid "Vietnamese"
 msgstr "베트남어"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "선택한 연락처에서는 파일을 받을 수 없습니다."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "선택한 연락처는 연결 중지 상태입니다."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "오류 메시지 없음"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "메신저 (엠퍼시)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "시작할 때 연결하지 않습니다"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "시작할 때 연락처 목록이나 기타 대화창을 표시하지 않습니다"
 
 # IM은 메신저라고 번역
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- 엠퍼시 메신저 클라이언트"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "계정 관리에 연결하는데 오류"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3012,229 +3000,93 @@ msgstr ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "그놈 인스턴스 메시지 클라이언트"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr "GNOME Korea <http://gnome.or.kr/>"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "계정을 가져오는데 오류가 발생했습니다."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "계정 정보를 파싱하는데 오류가 발생했습니다."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "계정을 만드는데 오류가 발생했습니다."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "오류가 발생했습니다."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "오류 메시지는: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"뒤로 돌아가서 계정 정보를 다시 입력할 수도 있고, 아니면 이 도우미를 마치고 나"
-"중에 편집 메뉴에서 계정을 추가할 수도 있습니다."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "오류가 발생했습니다"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "어떤 종류의 대화 계정을 보유하고 있습니까?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "설정할 또 다른 대화 계정이 있습니까?"
-
-# 도구 설명
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "계정 정보를 편집합니다"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "어떤 종류의 대화 계정을 만드시겠습니까?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "다른 대화 계정을 더 만드시겠습니까?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "새 계정의 정보를 입력하십시오"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
 msgstr ""
-"엠퍼시를 사용해 주변에 연결된 사람들 및 구글 토크, AIM, 윈도우 라이브, 기타 "
-"대화 프로그램을 사용하는 친구, 동료들과 대화할 수 있습니다. 마이크와 웹카메라"
-"를 사용하면 음성 및 영상 통화도 할 수 있습니다."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "다른 대화 프로그램에서 사용하던 계정이 있습니까?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "예, 계정 정보를 다음에서 가져옵니다: "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "예, 지금 계정 정보를 입력합니다"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "아니오, 새 계정을 만듭니다"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "아니오, 현재 주위에 연결한 사람을 보고 싶습니다"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "가져오려는 계정을 선택하십시오:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "예"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "아니오, 지금은 됐습니다"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"같은 네트워크에 연결된 사람을 자동으로 찾아서 대화할 수 있습니다. 이 기능을 "
-"사용하려면 먼저 아래 사항이 올바른지 확인하십시오. '계정' 대화창에서 이 설정"
-"을 바꿀 수도 있고, 이 기능을 끌 수도 있습니다."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "편집->계정"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "이 기능 사용하지 않기(_N)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"telepathy-salut를 설치하지 않았으므로 로컬 네트워크에 연결된 사람과 대화할 "
-"수 없습니다. 이 기능을 사용하려면 telepathy-salut 패키지를 설치하고 '계정' 대"
-"화창에서 '주변 사람\"을 만드십시오"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut를 설치하지 않았습니다"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "메신저 및 VoIP 계정 도우미"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "안녕하세요, 엠퍼시입니다"
-
-# tooltip
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "기존 계정을 가져옵니다"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "개인 정보를 입력하십시오"
+"류창우 <cwryu@debian.org>\n"
+"조성호<darkcircle.0426@gmail.com>"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "%s 계정에 저장하지 않은 수정 사항이 있습니다."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "새로 만든 계정을 아직 저장하지 않았습니다."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "연결하는 중…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "연결 중지 상태 — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "연결 끊김 — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "연결 중지 상태 — 네트워크 연결 없음"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "알 수 없는 상태"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"이 계정은 너무 오래되었고 백엔드를 지원하지 않기 때문에 비활성화 되었습니다. "
+"이 계정을 가져오려면 telepathy-haze를 설치하고 세션을 다시 시작하여 주시기 바"
+"랍니다."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "연결 중지 상태 — 계정 사용하지 않음"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"새 계정을 만드려 합니다. 그러면 바뀐 사항을 잃어버리게 됩니다. 정말 계속 하시"
-"겠습니까?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "연결 인자를 편집합니다"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "서버로부터 여러붙의 개인 정보를 가져오는데 실패했습니다."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "여러분의 개인 정보를 편집하려면 온라인으로 이동하십시오."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "연결 인수 편집(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "정말로 컴퓨터에서 %s 계정을 제거하시겠습니까?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "서버의 계정은 제거하지 않습니다."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3243,15 +3095,23 @@ msgstr ""
 "하시겠습니까?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "사용(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "사용 않기(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "건너 뛰기(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "연결(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3263,150 +3123,130 @@ msgstr ""
 msgid "Add…"
 msgstr "추가…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "계정 정보를 읽어들이는 중입니다"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "프로토콜을 설치하지 않았습니다"
+msgid "_Import…"
+msgstr "가져오기(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "프로토콜:"
+msgid "Loading account information"
+msgstr "계정 정보를 읽어들이는 중입니다"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "새 계정을 만들면, 해당 프로토콜의 백엔드를 먼저 설치해야 합니다."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "가져오기(_I)…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "설치한 백엔드 프로토콜이 없습니다"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - 엠퍼시 인증 클라이언트"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "엠퍼시 인증 클라이언트"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "주변 사람"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- 엠퍼시 음성/영상 클라이언트"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "엠퍼시 음성/영상 클라이언트"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "대비"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "밝기"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "감마"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "볼륨"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "가장자리 창(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "음성 입력"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "영상 입력"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "숫자판"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "자세히"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "호출: %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "컴퓨터에서 확인한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "인터넷 서버에서 확인한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "다른 상대편 컴퓨터에서 확인한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "중계 서버가 확인한 IP 주소"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "멀티캐스트 그룹의 IP 주소"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "알 수 없음"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "알 수 없음"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "알 수 없음"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "연결 — %d:%02d"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "기술 정보"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3415,8 +3255,8 @@ msgstr ""
 "이 컴퓨터에서 지원하는 음성 형식 중에서 %s 측의 소프트웨어에서 지원하지 않는 "
 "음성 형식이 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3425,8 +3265,8 @@ msgstr ""
 "이 컴퓨터에서 지원하는 영상 형식 중에서 %s 측의 소프트웨어에서 지원하지 않는 "
 "영상 형식이 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3435,27 +3275,27 @@ msgstr ""
 "%s에 연결할 수 없습니다. 현재 직접 연결을 허용하지 않는 네트워크에 연결되어 "
 "있을 수도 있습니다."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "네트워크 관련해 실패했습니다."
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "이 호출에 필요한 음성 형식을 지원하는 기능을 컴퓨터에 설치하지 않았습니다."
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "이 호출에 필요한 영상 형식을 지원하는 기능을 컴퓨터에 설치하지 않았습니다."
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3465,257 +3305,300 @@ msgstr ""
 "텔레파시 컴포넌트에 예상치 못한 일이 발생했습니다. <a href=\"%s\">이 버그를 "
 "보고해 주시고</a> 도움말 메뉴의 '디버깅' 창에 있는 기록을 첨부하십시오."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "호출 엔진에 실패가 발생했습니다"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "스트림이 끝났습니다"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "음성 스트림에 연결할 수 없습니다"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "영상 스트림에 연결할 수 없습니다"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "음성"
+msgid "_Call"
+msgstr "통화(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "디코딩 코덱:"
+msgid "_Microphone"
+msgstr "마이크(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "카메라 사용 않기"
+msgid "_Camera"
+msgstr "카메라(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "숫자판 표시"
+msgid "_Settings"
+msgstr "설정(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "인코딩 코덱:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "보기(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "끊기"
+#: ../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 "도움말(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "현재 호출을 끊습니다"
+#: ../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 "차례(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "로컬 후보:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "디버깅(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "최대화"
+msgid "Swap camera"
+msgstr "카메라 바꾸기"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "최소화"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "원격 후보:"
+msgid "Maximise me"
+msgstr "최대화"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "음성 보내기"
+msgid "Disable camera"
+msgstr "카메라 사용 않기"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "영상 보내기"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "끊기"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "숫자판 표시"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "현재 호출을 끊습니다"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "영상 통화"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "영상 통화 시작"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "음성 통화 시작"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "카메라 바꾸기"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "오디오 전송을 켜고 끕니다"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "비디오 전송을 켜고 끕니다"
+msgid "Show dialpad"
+msgstr "숫자판 표시"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "알 수 없음"
+msgid "Display the dialpad"
+msgstr "숫자판 표시"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "영상 보내기"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "영상 통화"
+msgid "Toggle video transmission"
+msgstr "비디오 전송을 켜고 끕니다"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "통화(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "음성 보내기"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "카메라(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "차례(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "오디오 전송을 켜고 끕니다"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "디버깅(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "인코딩 코덱:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "도움말(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "디코딩 코덱:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "마이크(_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "원격 후보:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "설정(_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "로컬 후보:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "보기(_V)"
+msgid "Audio"
+msgstr "음성"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "창을 닫으시겠습니까?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "창을 닫으면 %s에서 떠납니다. 다시 참여하지 않는 한 더 이상의 메시지를 받을 수 없게 됩니다."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"이 창을 닫으면 %u개의 대화방을 닫습니다. 다시 참여하기 전에는 더 이상의 메시"
+"지를 받을 수 없습니다."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "%s에서 나가시겠습니까?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"다시 참여하기 전에는 이 대화방으로부터 더 이상의 메시지를 받을 수 없습니다."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "창 닫기"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "방 나가기"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d개 읽지 않음)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (기타 %u개)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (다른 탭 %d개 읽지 않음)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (모두 %d개 읽지 않음)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "단문 문자:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "메시지 %d개 보내는 중"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "메시지를 입력하는 중입니다."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "지우기(_L)"
+msgid "_Conversation"
+msgstr "대화(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "연락처(_O)"
+msgid "C_lear"
+msgstr "지우기(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "이모티콘 입력(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "즐겨 찾는 대화방(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "참석자 초대(_P)…"
+msgid "Notify for All Messages"
+msgstr "모든 메시지 알리기"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "탭 왼쪽으로 이동(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "연락처 목록 표시(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "탭 오른쪽으로 이동(_R)"
+msgid "Invite _Participant…"
+msgstr "참석자 초대(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "모든 메시지 알리기"
+msgid "C_ontact"
+msgstr "연락처(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "대화(_C)"
+msgid "_Tabs"
+msgstr "탭(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "탭 떼어내기(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "즐겨 찾는 대화방(_F)"
+msgid "_Previous Tab"
+msgstr "이전 탭(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "다음 탭(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "이전 탭(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "탭 닫기 실행 취소(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "연락처 목록 표시(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "탭 왼쪽으로 이동(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "탭(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "탭 오른쪽으로 이동(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "탭 닫기 실행 취소(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "탭 떼어내기(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3729,100 +3612,100 @@ msgstr "방"
 msgid "Auto-Connect"
 msgstr "자동 연결"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "즐겨 찾기 대화방 관리"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "영상 호출 받음"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "호출 받음"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 님이 영상 호출하고 있습니다. 응답하시겠습니까?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 님이 호출하고 있습니다. 응답하시겠습니까?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "%s에서 온 호출"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "거부(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "응답(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "영상으로 응답(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "%s에서 온 영상 호출"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "방 초대"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s 방에 초대"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 님이 %s 방에 초대합니다"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "거절(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "입장(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 님이 %s 방에 초대했습니다"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s 방에 초대 받았습니다"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "파일 전송을 받았습니다 (%s에서)"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "암호 필요"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "\"%s\"님이 연결되었을 때 알 수 있는 권한을 요청합니다"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3832,105 +3715,105 @@ msgstr ""
 "메시지: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s (전체 %s, 속도 %s/s)"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s (전체 %s)"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" 파일 받는 중 (%s에서)"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" 파일 보내는 중 (%s에게)"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "\"%s\" 파일을 %s에서 받는 중 오류"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "파일을 받는데 오류"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" 파일을 %s에 보내는 중 오류"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "파일을 보내는데 오류"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" 파일 받음 (%s에서)"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" 파일 보냄 (%s에게)"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "파일 전송 완료"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "다른 참석자의 응답을 기다리는 중입니다"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" 파일이 올바른지 검사하는 중입니다"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\"의 해시를 구하는 중입니다"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "파일"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "남음"
 
@@ -3942,177 +3825,207 @@ msgstr "파일 전송"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "목록에서 완료했거나, 취소했거나, 실패한 파일 전송 제거"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "가져오기(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "가져올 계정이 없습니다. 현재 엠퍼시는 피진 계정 가져오기만 지원합니다."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "계정 가져오기"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "가져오기"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "소스"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "암호 입력"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "연결 끊기"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "이 연락처를 보려면 계정을 설정해야 합니다."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "해당 사항이 없습니다"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"죄송하지만, %s 계정은 %s 소프트웨어를 업데이트 하기 전에는 사용하실 수 없습니"
+"다."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "소프트웨어 업데이트..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "닫기"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "다시 연결"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "계정 편집"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "닫기"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "%s 올리기 (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "계정 크레디트 올리기"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "올리기..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "연락처"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "이 연락처를 보려면 여러분의 계정 중 하나를 활성화 해야 합니다."
+
+#. 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 "이 연락처를 보려면 %s을(를) 활성화 해야 합니다."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "연락처 목록"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "지도 위에 연락처(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "계정 설정"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "크레디트 잔액"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "새 대화(_N)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "연락처 목록에서 찾기(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "새 호출(_C)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "즐겨 찾기에 입장(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "연락처 검색(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "즐겨 찾기 관리"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "파일 전송(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "보통 크기(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "연결 중지 상태 연락처(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "새 호출(_C)…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "프로토콜 표시(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "보통 크기, 아바타 포함(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "크레디트 잔액"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "지도 위에 연락처(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "계정(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "차단한 연락처(_B)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "기본 설정(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "프로토콜 표시(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "연락처 목록에서 찾기(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "이름 순서로 정렬(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "상태 순서로 정렬(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "계정(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "보통 크기, 아바타 포함(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "차단한 연락처(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "보통 크기(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "작은 크기(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "파일 전송(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "방(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "입장(_J)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "새 대화(_N)…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "연결 중지 상태 연락처(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "개인 정보(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "방(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "즐겨 찾기에 입장(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "연락처 검색(_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "즐겨 찾기 관리"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "대화방"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "구성원"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4125,22 +4038,27 @@ msgstr ""
 "암호 필요: %s\n"
 "구성원: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "예"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "아니요"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "방 목록을 시작할 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "방 목록을 중지할 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "방 목록을 읽어들일 수 없습니다"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "방 입장"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4148,6 +4066,10 @@ msgid ""
 msgstr "입장하려는 방 이름을 입력하거나 목록에서 방을 누르십시오."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "대화방(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4155,509 +4077,569 @@ msgstr ""
 "방이 있는 서버를 입력하십시오. 현재 계정의 서버에 그 방이 있는 경우 비워 두십"
 "시오."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "방 입장"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "방 목록을 읽어들일 수 없습니다"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "방 목록"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "대화방(_R):"
-
 # 상태 메시지
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "메시지 받음"
 
 # 상태 메시지
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "메시지 보냄"
 
 # 상태 메시지
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "새 대화"
 
 # 상태 메시지
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "연락처가 온라인"
 
 # 상태 메시지
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "연락처가 연결 중지 상태"
 
 # 상태 메시지
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "계정 연결"
 
 # 상태 메시지
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "계정 연결 끊김"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "언어"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "줄리엣"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "로미오"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "아, 로미오! 로미오! 어째서 당신 이름은 로미오인가요?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "아버지를 잊으시고 그 이름을 버리세요."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "그게 싫거든 저를 사랑한다고 맹세만이라도 해주세요."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 "그렇게 못하시겠다면 차라리 제가 더 이상 캐플리트 가문의 성을 쓰지 않겠어요."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "좀 더 들어볼까? 아니면 지금 말을 걸어볼까? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "줄리엣 님의 연결이 끊겼습니다"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "기본 설정"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "이모티콘을 그림으로 표시(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "방에 연락처 목록 표시(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "모양"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "동작"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "다음에서 대화를 시작합니다:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "대화 테마(_E):"
+msgid "new ta_bs"
+msgstr "새 탭(_B)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "자리 비움이거나 다른 용무 중일 때 알리지 않기(_A)"
+msgid "new _windows"
+msgstr "새 창(_W)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "자리 비움이거나 다른 용무 중일 때 소리 사용하지 않기(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "알림 영역에 새로 들어온 이벤트 표시"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "시작할 때 자동으로 연결(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"음향 반향 제거 기능을 사용하면 내 목소리가 상대방에게 더 분명히 들립니다. 하"
-"지만 일부 컴퓨터에서 문제가 발생할 수 있습니다. 통화 중에 나 또는 상대방에게 "
-"잡음이 들린 다면 음향 반향 제거 기능을 끄고 다시 통화해 보십시오."
+msgid "Log conversations"
+msgstr "대화 내용 기록"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "연락처의 사람이 연결하면 알리기"
+msgid "Behavior"
+msgstr "동작"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "연락처의 사람이 연결이 끊어지면 알리기"
+msgid "General"
+msgstr "일반"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "대화에 포커스가 없으면 팝업 알리기(_C)"
+msgid "_Enable bubble notifications"
+msgstr "풍선 알림 사용(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "맞춤법 검사를 사용할 언어:"
+msgid "Disable notifications when _away or busy"
+msgstr "자리 비움이거나 다른 용무 중일 때 알리지 않기(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "일반"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "대화에 포커스가 없으면 팝업 알리기(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "입력 단계:"
+msgid "Enable notifications when a contact comes online"
+msgstr "연락처의 사람이 연결하면 알리기"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "입력 볼륨:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "연락처의 사람이 연결이 끊어지면 알리기"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "알림"
 
-# 위치 정보를 알아내는 방법
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "위치 검색 방법:"
+msgid "_Enable sound notifications"
+msgstr "사운드 알림 사용(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "대화 내용 기록"
+msgid "Disable sounds when _away or busy"
+msgstr "자리 비움이거나 다른 용무 중일 때 소리 사용하지 않기(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "알림"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "이벤트 소리 내기"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "소리"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "개인 정보"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "음향 반향 제거 기능으로 통화 품질 높이기(_E)"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"위치 부정확하게 만들기를 사용하면 도시, 지역, 국가 정도 이상 자세히 표시하지 "
-"않습니다. GPS 좌표는 소수점 1자리까지만 허용합니다."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "이모티콘을 그림으로 표시(_S)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "방에 연락처 목록 표시(_L)"
+"음향 반향 제거 기능을 사용하면 내 목소리가 상대방에게 더 분명히 들립니다. 하"
+"지만 일부 컴퓨터에서 문제가 발생할 수 있습니다. 통화 중에 나 또는 상대방에게 "
+"잡음이 들린 다면 음향 반향 제거 기능을 끄고 다시 통화해 보십시오."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "소리"
+msgid "_Publish location to my contacts"
+msgstr "위치를 연락처에 있는 사람들에게 공개(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "맞춤법 검사"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "이 언어 목록은 사전을 설치한 언어에만 적용됩니다."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"위치 부정확하게 만들기를 사용하면 도시, 지역, 국가 정도 이상 자세히 표시하지 "
+"않습니다. GPS 좌표는 소수점 1자리까지만 허용합니다."
 
+#. 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 "Themes"
-msgstr "테마"
+msgid "_Reduce location accuracy"
+msgstr "위치 부정확하게 만들기(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "음향 반향 제거 기능으로 통화 품질 높이기(_E)"
+msgid "Privacy"
+msgstr "개인 정보"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "변종:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "시작할 때 자동으로 연결(_A)"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "휴대전화(_C)"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "풍선 알림 사용(_E)"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "네트워크(_N) (IP, Wi-FI)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "사운드 알림 사용(_E)"
+# 위치 정보를 알아내는 방법
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "위치 검색 방법:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "이 언어 목록은 사전을 설치한 언어에만 적용됩니다."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "네트워크(_N) (IP, Wi-FI)"
+msgid "Enable spell checking for languages:"
+msgstr "맞춤법 검사를 사용할 언어:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "새로운 대화는 별도 창에 열기(_O)"
+msgid "Spell Checking"
+msgstr "맞춤법 검사"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "위치를 연락처에 있는 사람들에게 공개(_P)"
+msgid "Chat Th_eme:"
+msgstr "대화 테마(_E):"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "변종:"
 
-#. 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:41
-msgid "_Reduce location accuracy"
-msgstr "위치 부정확하게 만들기(_R)"
+msgid "Themes"
+msgstr "테마"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "상태"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "끝내기(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "이 연락처에 다시 호출"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "카메라 끄기"
+msgid "Redial"
+msgstr "다시 걸기"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "카메라 켜기"
+msgid "V_ideo"
+msgstr "영상(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "영상 끄기"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "카메라를 사용하지 않고 영상 보내기를 중지합니다"
+msgid "Video Preview"
+msgstr "영상 미리 보기"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "카메라를 사용하고 영상을 보냅니다"
+msgid "Video On"
+msgstr "영상 켜기"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "카메라를 사용하지만 영상을 보내지 않습니다"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "이 연락처에 다시 호출"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "미리 보기"
+msgid "Camera Off"
+msgstr "카메라 끄기"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "다시 걸기"
+msgid "Disable camera and stop sending video"
+msgstr "카메라를 사용하지 않고 영상 보내기를 중지합니다"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "영상(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "미리 보기"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "영상 끄기"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "카메라를 사용하지만 영상을 보내지 않습니다"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "영상 켜기"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "카메라 켜기"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "영상 미리 보기"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "카메라를 사용하고 영상을 보냅니다"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "연락처 지도 보기"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "저장"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 연결"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 응답"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"한 번에 붙여넣을 데이터가 너무 큽니다. 로그를 파일로 저장하여 주십시오."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "디버깅 창"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Pastebin으로 보내기"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "일시 중지"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "단계 "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "디버깅"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "정보"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "메시지"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "경고"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "치명적"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "오류"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "시각"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "범위"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "분류"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "단계"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "선택한 연결 관리자는 원격 디버깅 확장 기능을 지원하지 않습니다."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "참석자 초대"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "대화에 초대할 연락처를 고르십시오:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "초대"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "대화창을 표시하지 않고, 필요한 동작을 (예를 들어 가져오기) 한 다음 끝납니다"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "\"주변 사람\" 계정만 있는 경우가 아니라면 대화창을 표시하지 않습니다"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "최초에 주어진 계정을 선택합니다 (예, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<계정아이디>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- 엠퍼시 계정"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "엠퍼시 계정"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "특정 서비스 표시"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- 엠퍼시 디버깅"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "엠퍼시 디버깅"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- 엠퍼시 채팅 클라이언트"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "응답"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "거부"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "응답"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "영상으로 응답"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "거절"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "허용"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "입력"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s에서 호출을 시도했지만, 다른 호출 중이었습니다."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "일시 중지"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "묵음"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "시간"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02d"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "현재 잔액은 %s 입니다."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "죄송하지만, 전화를 걸 잔고가 부족합니다."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "위로 올리기"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "대소문자 구별(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "어떤 종류의 대화 계정을 보유하고 있습니까?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "새 계정 추가"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "주변 사람"
+
+#: ../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."
+msgstr ""
+"엠퍼시는 같은 네트워크에 연결된 사람을 자동으로 찾아서 대화할 수 있습니다. "
+"이 기능을 사용하려면 먼저 아래 사항이 올바른지 확인하십시오."
+
+#: ../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 ""
+"이 세부 내용을 나중에 바꾸거나, 연락처 목록의 <span style=\"italic\">편집 → "
+"계정</span>을 선택하여 이 기능을 비활성화할 수 있습니다."
diff --git a/po/lv.po b/po/lv.po
index 786e8bacd..c3b273320 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,522 +7,581 @@
 # Anita Reitere <nitalynx@gmail.com>, 2010.
 # Peteris Krisjanis <pecisk@gmail.com>, 2010.
 # Rudolfs <rudolfs.mazurs@gmail.com>, 2011.
-# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011.
+# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-18 16:18+0000\n"
-"PO-Revision-Date: 2011-09-18 21:14+0300\n"
-"Last-Translator: Rūdofls Mazurs <rudolfs.mazurs@gmail.com>\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-13 10:20+0000\n"
+"PO-Revision-Date: 2012-03-13 17:27+0200\n"
+"Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 "X-Generator: Lokalize 1.2\n"
-"Language: lv\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Tērzē, izmantojot Google Talk, Facebook, MSN un daudzus citus tērzēšanas "
-"pakalpojumus"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "TZ klients"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Tūlītēja ziņojumapmaiņa"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "TZ klients"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Tērzē, izmantojot Google Talk, Facebook, MSN un daudzus citus tērzēšanas "
+"pakalpojumus"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Ziņojumapmaiņas un IP balss pārraides konti"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Pārvaldīt ziņojumapmaiņas un IP balss pārraides kontus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Vienmēr atvērt jaunu tērzēšanas logu jaunām sarakstēm."
+msgid "Connection managers should be used"
+msgstr "Vajadzētu izmantot savienojumu pārvaldniekus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Zvana skaļums"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Vai vajadzētu izmantot savienojumu pārvaldnieku, lai automātiski atvienotos/"
+"savienotos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Zvana skaļums, izteikts procentos."
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy vajadzētu automātiski savienoties pēc palaišanas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Kameras ierīce"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr ""
+"Vai Empathy pēc palaišanas vajadzētu automātiski pieslēgties jūsu kontiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Kameras novietojums"
+msgid "Empathy should auto-away when idle"
+msgstr "Kad dators ir dīkstāvē, automātiski mainīt statusu uz 'Projām'"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Rakstzīme, ko pievienot pēc iesaukas, lietojot Tab iesauku pabeigšanai grupu "
-"tērzēšanā."
+"Vai Empathy vajadzētu mainīt statusu uz 'projām', ja lietotājs nedarbojas ar "
+"datoru."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tērzēšanas loga tēma"
+msgid "Empathy default download folder"
+msgstr "Empathy noklusētā lejupielādes mape"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Tērzēšanas loga tēmas variants"
+msgid "The default folder to save file transfers in."
+msgstr "Noklusētā mape, kurā saglabāt saņemtos failus."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Valodu saraksts, ko izmantot pareizrakstības pārbaudei (piemēram: en, fr, "
-"nl)."
+"Maģiskais skaitlis, ko izmanto, lai pārbaudītu, vai ir jāveic veselā saprāta "
+"apkope"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Kompakts kontaktu saraksts"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c izmanto šo skaitli, lai pārbaudītu, vai būtu jāveic "
+"uzkopšanas darbi. Lietotājam nevajadzētu pašam šo skaitli mainīt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Vajadzētu izmantot savienojumu pārvaldniekus"
+msgid "Show offline contacts"
+msgstr "Rādīt nesaistes kontaktus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kontaktu saraksta kārtošanas kritērijs"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Vai rādīt kontaktu sarakstā kontaktus, kuri ir nesaistē."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Noklusētā kamera, ko izmantot video zvaniem, piem. /dev/video0."
+msgid "Show avatars"
+msgstr "Rādīt attēlus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Noklusētā mape, no kuras izvēlēties lietotāja attēlu"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Vai rādīt kontaktu attēlus kontaktu sarakstā un tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Izslēgt izlecošos paziņojumus, kad esmu projām"
+msgid "Show protocols"
+msgstr "Rādīt protokolus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Atslēgt skaņu, kad esmu projām"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Vai rādīt protokolus kontaktu sarakstā un tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Rādīt ienākošos notikumus statusa laukā"
+msgid "Show Balance in contact list"
+msgstr "Rādīt bilanci kontaktu sarakstā"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Rādīt ienākošos notikumus statusa laukā. Ja nepatiess, lietotājam tos rādīt "
-"nekavējoties."
+msgid "Whether to show account balances in the contact list."
+msgstr "Vai rādīt kontu bilanci kontaktu sarakstā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Atbalss atcelšanas atbalsts"
+msgid "Compact contact list"
+msgstr "Kompakts kontaktu saraksts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Empathy drīkst publicēt lietotāja atrašanās vietu"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Vai rādīt kontaktu sarakstu kompaktajā režīmā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy drīkst izmantot GPS, lai uzminētu atrašanās vietu"
+msgid "Hide main window"
+msgstr "Slēpt galveno logu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašanās vietu"
+msgid "Hide the main window."
+msgstr "Slēpt galveno logu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy drīkst izmantot tīklu, lai uzminētu atrašanās vietu"
+msgid "Default directory to select an avatar image from"
+msgstr "Noklusētā mape, no kuras izvēlēties lietotāja attēlu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Empathy noklusētā lejupielādes mape"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Pēdējā mape, no kuras tika ņemts lietotāja attēls."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy ir pārnesusi butterfly žurnālus"
+msgid "Open new chats in separate windows"
+msgstr "Atvērt jaunas sarakstes atsevišķos logos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Kad dators ir dīkstāvē, automātiski mainīt statusu uz 'Projām'"
+msgid "Always open a separate chat window for new chats."
+msgstr "Vienmēr atvērt jaunu tērzēšanas logu jaunām sarakstēm."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy vajadzētu automātiski savienoties pēc palaišanas"
+msgid "Display incoming events in the status area"
+msgstr "Rādīt ienākošos notikumus statusa laukā"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy vajadzētu samazināt atrašanās vietas precizitāti"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Rādīt ienākošos notikumus statusa laukā. Ja nepatiess, lietotājam tos rādīt "
+"nekavējoties."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy vajadzētu izmantot kontakta attēlu kā tērzēšanas loga ikonu"
+msgid "The position for the chat window side pane"
+msgstr "Tērzēšanas loga sānu rūts novietojums"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Ieslēgt WebKit izstrādes rīkus"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Tērzēšanas loga sānu paneļa saglabātais novietojums (pikseļos)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Ieslēgt izlecošos paziņojumus jauniem ziņojumiem"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "Rādīt kontaktu grupas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Ieslēgt pareizrakstības pārbaudi"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "Vai rādīt kontaktu grupas kontaktu sarakstā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Slēpt galveno logu"
+msgid "Contact list sort criterion"
+msgstr "Kontaktu saraksta kārtošanas kritērijs"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Slēpt galveno logu."
+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 ""
+"Kuru kritēriju izmantot, kārtojot kontaktu sarakstu. Noklusētā vērtība ir "
+"\"state\" - kārtot pēc kontakta statusa. Vērtība \"name\" kārtos kontaktus "
+"pēc to vārda."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Iesaukas pabeigšanas rakstzīme"
+msgid "Use notification sounds"
+msgstr "Lietot skaņas paziņojumus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Atvērt jaunas sarakstes atsevišķos logos"
+msgid "Whether to play a sound to notify of events."
+msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Ceļš uz lietojamo Adium tēmu"
+msgid "Disable sounds when away"
+msgstr "Atslēgt skaņu, kad esmu projām"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Ceļš uz Adium tēmu, ja tādu izmanto šajā tērzēšanā."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Vai atskaņot skaņas paziņojumu, kad esmu prom vai aizņemts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Atskaņot skaņu ienākošajiem ziņojumiem"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Atskaņot skaņu jaunām sarunām"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Vai atskaņot skaņu, lai paziņotu par ienākošajiem ziņojumiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Atskaņot skaņu izejošajiem ziņojumiem"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Atskaņot skaņu, kad kontakts ienāk"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Atskaņot skaņu, kad kontakts iziet"
+msgid "Play a sound for new conversations"
+msgstr "Atskaņot skaņu jaunām sarunām"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Atskaņot skaņu, kad mēs ieejam"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Vai atskaņot skaņu, lai paziņotu par jaunām sarunām."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Atskaņot skaņu, kad mēs izejam"
+msgid "Play a sound when a contact logs in"
+msgstr "Atskaņot skaņu, kad kontakts ienāk"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Rādīt izlecošo paziņojumu, ja tērzēšanas logs nav fokusēts"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīklā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Rādīt paziņojumu izlecošajā logā, kad ienāk kontakts"
+msgid "Play a sound when a contact logs out"
+msgstr "Atskaņot skaņu, kad kontakts iziet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Rādīt paziņojumu izlecošajā logā, kad iziet kontakts"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izgājis no tīkla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Novietojums, kādā jābūt kameras priekšskatījumam zvana laikā."
+msgid "Play a sound when we log in"
+msgstr "Atskaņot skaņu, kad mēs ieejam"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Rādīt bilanci kontaktu sarakstā"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Vai atskaņot skaņu, piesakoties tīklā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Rādīt attēlus"
+msgid "Play a sound when we log out"
+msgstr "Atskaņot skaņu, kad mēs izejam"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Rādīt kontaktu sarakstu istabās"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Vai atskaņot skaņu, izejot no tīkla."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Rādīt norādi par galvenā loga aizvēršanu"
+msgid "Enable popup notifications for new messages"
+msgstr "Ieslēgt izlecošos paziņojumus jauniem ziņojumiem"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Rādīt nesaistes kontaktus"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Rādīt protokolus"
+msgid "Disable popup notifications when away"
+msgstr "Izslēgt izlecošos paziņojumus, kad esmu projām"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Pareizrakstības pārbaudes valodas"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Vai rādīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Noklusētā mape, kurā saglabāt saņemtos failus."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Rādīt izlecošo paziņojumu, ja tērzēšanas logs nav fokusēts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Pēdējā mape, no kuras tika ņemts lietotāja attēls."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Vai rādīt izlecošo paziņojumu, saņemot jaunu ziņojumu, kad tērzēšanas logs "
+"jau ir atvērts, bet nav fokusēts."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Tērzēšanas loga sānu rūts novietojums"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Rādīt paziņojumu izlecošajā logā, kad ienāk kontakts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Tērzēšanas loga sānu paneļa saglabātais novietojums (pikseļos)"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Vai rādīt izlecošo paziņojumu, kad kontakts parādās tiešsaistē."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tēma, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Rādīt paziņojumu izlecošajā logā, kad iziet kontakts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Tēmas variants, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Vai rādīt izlecošo paziņojumu, kad kontakts iziet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Lietot grafiskos smaidiņus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Lietot skaņas paziņojumus"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Vai sarunās smaidiņus pārveidot par grafiskiem attēliem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Lietot tēmu tērzēšanas istabās"
+msgid "Show contact list in rooms"
+msgstr "Rādīt kontaktu sarakstu istabās"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Vai Empathy drīkst publicēt lietotāja atrašanās vietu viņa kontaktiem."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Vai rādīt kontaktu sarakstu tērzēšanas istabās."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Vai Empathy drīkst izmantot GPS, lai uzminētu atrašanās vietu."
+msgid "Chat window theme"
+msgstr "Tērzēšanas loga tēma"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr ""
-"Vai Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašanās vietu."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tēma, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Vai Empathy drīkst izmantot tīklu, lai uzminētu atrašanās vietu."
+msgid "Chat window theme variant"
+msgstr "Tērzēšanas loga tēmas variants"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Vai Empathy ir pārnesusi butterfly žurnālus."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Tēmas variants, kuru izmantot, lai attēlotu sarunas tērzēšanas logos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"Vai Empathy pēc palaišanas vajadzētu automātiski pieslēgties jūsu kontiem."
+msgid "Path of the Adium theme to use"
+msgstr "Ceļš uz lietojamo Adium tēmu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Vai Empathy vajadzētu mainīt statusu uz 'projām', ja lietotājs nedarbojas ar "
-"datoru."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Ceļš uz Adium tēmu, ja tādu izmanto šajā tērzēšanā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Vai Empathy vajadzētu samazināt atrašanās vietas precizitāti (privātumam)."
+msgid "Enable WebKit Developer Tools"
+msgstr "Ieslēgt WebKit izstrādes rīkus"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Vai Empathy vajadzētu izmantot kontakta attēlu kā tērzēšanas loga ikonu."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Vai WebKit izstrādes rīkiem, piemēram, Web Inspector, vajadzētu būt "
 "ieslēgtiem."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informēt citus lietotājus par to, kad veicat rakstīšanu"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Vai vajadzētu izmantot savienojumu pārvaldnieku, lai automātiski atvienotos/"
-"savienotos."
+"Vai sūtīt 'raksta' vai 'pauzēts' tērzēšanas stāvokļus. Pašlaik neietekmē "
+"'prom' stāvokli."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Vai pārbaudīt uzrakstīto vārdu piederību izvēlētajām valodām."
+msgid "Use theme for chat rooms"
+msgstr "Lietot tēmu tērzēšanas istabās"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Vai sarunās smaidiņus pārveidot par grafiskiem attēliem."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Vai izmantot tēmu tērzēšanas istabās."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Vai aktivēt Pulseaudio atbalss atcelšanas filtru."
+msgid "Spell checking languages"
+msgstr "Pareizrakstības pārbaudes valodas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir pieteicies tīklā."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Valodu saraksts, ko izmantot pareizrakstības pārbaudei (piemēram: en, fr, "
+"nl)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Vai atskaņot skaņu, lai paziņotu, ka kontakts ir izgājis no tīkla."
+msgid "Enable spell checker"
+msgstr "Ieslēgt pareizrakstības pārbaudi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Vai atskaņot skaņu, lai paziņotu par notikumiem."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Vai pārbaudīt uzrakstīto vārdu piederību izvēlētajām valodām."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Vai atskaņot skaņu, lai paziņotu par ienākošajiem ziņojumiem."
+msgid "Nick completed character"
+msgstr "Iesaukas pabeigšanas rakstzīme"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Vai atskaņot skaņu, lai paziņotu par jaunām sarunām."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Rakstzīme, ko pievienot pēc iesaukas, lietojot Tab iesauku pabeigšanai grupu "
+"tērzēšanā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Vai atskaņot skaņu, lai paziņotu par izejošajiem ziņojumiem."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy vajadzētu izmantot kontakta attēlu kā tērzēšanas loga ikonu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Vai atskaņot skaņu, piesakoties tīklā."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Vai Empathy vajadzētu izmantot kontakta attēlu kā tērzēšanas loga ikonu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Vai atskaņot skaņu, izejot no tīkla."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
+"Pēdējais konts, kas tika izvēlēts dialoglodziņā \"Pievienoties istabai\""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Vai atskaņot skaņas paziņojumu, kad esmu prom vai aizņemts."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"D-Bus objektu ceļš pēdējam kontam, kas tika izvēlēts, lai savienotos ar "
+"istabu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Vai rādīt izlecošo paziņojumu, kad kontakts iziet."
+msgid "Camera device"
+msgstr "Kameras ierīce"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Vai rādīt izlecošo paziņojumu, kad kontakts parādās tiešsaistē."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Noklusētā kamera, ko izmantot video zvaniem, piem. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Vai rādīt izlecošo paziņojumu, saņemot jaunu ziņojumu, kad tērzēšanas logs "
-"jau ir atvērts, bet nav fokusēts."
+msgid "Camera position"
+msgstr "Kameras novietojums"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Vai rādīt izlecošo paziņojumu, kad saņem jaunu ziņojumu."
+msgid "Position the camera preview should be during a call."
+msgstr "Novietojums, kādā jābūt kameras priekšskatījumam zvana laikā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Vai rādīt kontu bilanci kontaktu sarakstā."
+msgid "Echo cancellation support"
+msgstr "Atbalss atcelšanas atbalsts"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Vai rādīt kontaktu attēlus kontaktu sarakstā un tērzēšanas logos."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Vai aktivēt Pulseaudio atbalss atcelšanas filtru."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Vai rādīt kontaktu sarakstā kontaktus, kuri ir nesaistē."
+msgid "Show hint about closing the main window"
+msgstr "Rādīt norādi par galvenā loga aizvēršanu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Vai rādīt izlecošos paziņojumus, kad esmu prom vai aizņemts."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Vai rādīt ziņojuma dialogu par galvenā loga aizvēršanu ar 'x' pogu "
+"virsraksta joslā."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Vai rādīt protokolus kontaktu sarakstā un tērzēšanas logos."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy drīkst publicēt lietotāja atrašanās vietu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Vai rādīt kontaktu sarakstu tērzēšanas istabās."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Vai Empathy drīkst publicēt lietotāja atrašanās vietu viņa kontaktiem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Vai rādīt kontaktu sarakstu kompaktajā režīmā."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy drīkst izmantot tīklu, lai uzminētu atrašanās vietu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Vai rādīt ziņojuma dialogu par galvenā loga aizvēršanu ar 'x' pogu "
-"virsraksta joslā."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Vai Empathy drīkst izmantot tīklu, lai uzminētu atrašanās vietu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Vai izmantot tēmu tērzēšanas istabās."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašanās vietu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr ""
+"Vai Empathy drīkst izmantot mobilo tīklu, lai uzminētu atrašanās vietu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy drīkst izmantot GPS, lai uzminētu atrašanās vietu"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Vai Empathy drīkst izmantot GPS, lai uzminētu atrašanās vietu."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy vajadzētu samazināt atrašanās vietas precizitāti"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Kuru kritēriju izmantot, kārtojot kontaktu sarakstu. Noklusētā vērtība ir "
-"\"name\" - kārtot pēc kontakta vārda. Vērtība \"state\" kārtos kontaktus pēc "
-"to statusa."
+"Vai Empathy vajadzētu samazināt atrašanās vietas precizitāti (privātumam)."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Pārvaldīt ziņojumapmaiņas un IP balss pārraides kontus"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Iemesls netika norādīts"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Ziņojumapmaiņas un IP balss pārraides konti"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Stāvokļa izmaiņas tika pieprasītas"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Jūs atcēlāt faila pārsūtīšanu"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Otrs dalībnieks atcēla faila pārsūtīšanu"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Notika kļūda, mēģinot pārsūtīt failu"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Otrs dalībnieks nevar pārsūtīt failu"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nezināms iemesls"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Faila pārsūtīšana pabeigta, bet fails ir bojāts"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Kontakts neatbalsta failu sūtīšanu"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Izvēlētais fails nav normāls fails"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Izvēlētais fails ir tukšs"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Neatbildēts zvans no %s"
@@ -538,172 +597,142 @@ msgstr "Zvanīja %s"
 msgid "Call from %s"
 msgstr "Zvans no %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Ligzdas tips nav atbalstīts"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Iemesls netika norādīts"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Stāvokļa izmaiņas tika pieprasītas"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Jūs atcēlāt faila pārsūtīšanu"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Otrs dalībnieks atcēla faila pārsūtīšanu"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Notika kļūda, mēģinot pārsūtīt failu"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Otrs dalībnieks nevar pārsūtīt failu"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Nezināms iemesls"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Pieejams"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Aizņemts"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Projām"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Neredzams"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nesaistē"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Iemesls netika norādīts"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Statuss ir \"nesaistē\""
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Tīkla kļūda"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentifikācija neizdevās"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Šifrēšanas kļūda"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Vārds jau ir aizņemts"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Nav sertifikāta"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Neuzticams sertifikāts"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikāts izbeidzies"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikāts nav aktivizēts"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Sertifikātu servera nosaukumu nesakritība"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Sertifikāta digitālo nospiedumu nesakritība"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Sertifikāts ir pašparakstīts"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Sertifikāta kļūda"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Šifrēšana nav pieejama"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikāts nav derīgs"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Savienojums tika atteikts"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Nevar izveidot savienojumu"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Savienojums pārtrūka"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Šis resurs jau ir savienots ar serveri"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "Šis konts jau ir savienots ar serveri"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Savienojums tika aizvietots ar jaunu savienojumu, kurš izmanto to pašu "
 "resursu"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Uz servera šāds konts jau ir"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serveris ir pārāk aizņemts, lai apstrādātu savienojumu"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikāts tika atsaukts"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikāts izmanto nedrošu šifrēšanas algoritmu vai arī ir kriptogrāfiski "
 "vājš"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -711,24 +740,31 @@ msgstr ""
 "Servera sertifikāta garums vai sertifikāta ķēdes dziļums pārsniedz "
 "ierobežojumus, ko nosaka kriptogrāfijas bibliotēka"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Jūsu programmatūra ir pārāk veca"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Iekšēja kļūda"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Tuvumā esošie cilvēki"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook tērzēšana"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -736,7 +772,7 @@ msgstr[0] "Pirms %d sekundes"
 msgstr[1] "Pirms %d sekundēm"
 msgstr[2] "Pirms %d sekundēm"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -744,7 +780,7 @@ msgstr[0] "Pirms %d minūtes"
 msgstr[1] "Pirms %d minūtēm"
 msgstr[2] "Pirms %d minūtēm"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -752,7 +788,7 @@ msgstr[0] "Pirms %d stundas"
 msgstr[1] "Pirms %d stundām"
 msgstr[2] "Pirms %d stundām"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -760,7 +796,7 @@ msgstr[0] "Pirms %d dienas"
 msgstr[1] "Pirms %d dienām"
 msgstr[2] "Pirms %d dienām"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -768,7 +804,7 @@ msgstr[0] "Pirms %d nedēļas"
 msgstr[1] "Pirms %d nedēļām"
 msgstr[2] "Pirms %d nedēļām"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -776,224 +812,211 @@ msgstr[0] "Pirms %d mēneša"
 msgstr[1] "Pirms %d mēnešiem"
 msgstr[2] "Pirms %d mēnešiem"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "nākotnē"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Parole nav atrasta"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s TZ parole (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Parole tērzēšanas istabai '%s' kontam %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Visi konti"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Parole"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serveris"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Ports"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Mani tīmekļa konti"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Konts %s tika rediģēts ar %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Kontu %s nevar rediģēt, izmantojot Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Palaist \"Mani tīmekļa konti\""
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Rediģēt %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Lietotājvārds:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Pielietot"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Pieteikties"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Uz servera šāds konts jau ir"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
-msgstr "Izveidot jaunu kontu uz servera"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "A_tcelt"
+msgstr "Izveidot jaunu kontu uz šī servera"
 
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s uz %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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s konts"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Jauns konts"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Piemērs:</b> MansEkrānaVārds"
+#: ../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:"
+msgstr "Pa_role:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Paplašināti"
+msgid "Screen _Name:"
+msgstr "Ekrā_na vārds:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Piemērs:</b> MansEkrānaVārds"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Pa_role:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Atcerēties paroli"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Atcerēties paroli"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Ports:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Atcerēties paroli"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Ekrā_na vārds:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Serveris:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Kāda ir jūsu AIM parole?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Paplašināti"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Kāds ir jūsu AIM ekrāna vārds?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Ports:"
+msgid "What is your AIM password?"
+msgstr "Kāda ir jūsu AIM parole?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Serveris:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Piemērs:</b> lietotājvārds"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Atcerēties paroli"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Lietotāja I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Piemērs:</b> lietotājvārds"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Kāds ir jūsu GroupWise lietotāja ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Kāda ir jūsu GroupWise parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Piemērs:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "R_akstzīmju kopa:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Kāds ir jūsu ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Kāda ir jūsu ICQ parole?"
 
@@ -1030,11 +1053,23 @@ msgstr "Opcijas"
 msgid "None"
 msgstr "Nekas"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Tīkls"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Tīkls:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Rakstzīmju kopa:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serveris"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1042,14 +1077,6 @@ msgstr ""
 "Vairums IRC serveru nepieprasa paroli; ja neesat pārliecināts, neievadiet "
 "paroli."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Tīkls"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Tīkls:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Iesauka:"
@@ -1066,48 +1093,20 @@ msgstr "Iziešanas ziņojums:"
 msgid "Real name:"
 msgstr "Īstais vārds:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serveris"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Kāds ir jūsu IRC ekrāna vārds?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Kurš IRC tīkls?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Piemērs:</b> lietotajs@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Piemērs:</b> lietotajs@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Vajad_zīga šifrēšana (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorēt SSL sertifikāta kļūdas"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Aizstāt servera iestatījumus"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Priori_tāte:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Kāds ir jūsu IRC ekrāna vārds?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Res_urss:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Kāds ir jūsu Facebook lietotāja vārds?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1119,179 +1118,203 @@ msgstr ""
 "Ja jums nav Facebook lietotāja vārda, varat to izvēlēties <a href=\"http://"
 "www.facebook.com/username/\">šajā lapā</a>."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Lietot veco SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Kāda ir jūsu Facebook parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Kāds ir jūsu Facebook lietotāja vārds?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Kāds ir jūsu Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Piemērs:</b> lietotajs@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Kāda ir jūsu Google parole?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Piemērs:</b> lietotajs@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorēt SSL sertifikāta kļūdas"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Priori_tāte:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Res_urss:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Ši_frēšana pieprasīta (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Lietot veco SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Aizstāt servera iestatījumus"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Kāds ir jūsu Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Kāda ir jūsu Jabber parole?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Kāds ir jūsu vēlamais Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Kāda ir jūsu Jabber parole?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Kāda ir jūsu vēlamā Jabber parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Piemērs:</b> lietotajs@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Kāds ir jūsu Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Kāda ir jūsu Windows Live parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_pasta adrese:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Iesau_ka:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Uzvārds:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Vārds:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Publiskotais vārds:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Uzvārds:"
+msgid "E-_mail address:"
+msgstr "E-_pasta adrese:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Publiskotais vārds:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Lietotājvārds:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Piemērs:</b> lietotajs@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Autentifikācijas vārds:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Atklāt saistīšanu"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Atklāt STUN serveri automātiski"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Šo kontu izmantot, _lai zvanītu iekšzemes un mobilajiem tālruņiem"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorēt TLS kļūdas"
+msgid "NAT Traversal Options"
+msgstr "NAT šķērsošanas opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervāls (sekundēs)"
+msgid "Proxy Options"
+msgstr "Starpniekservera opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-alive opcijas"
+msgid "Miscellaneous Options"
+msgstr "Dažādas opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Brīvā maršrutēšana"
+msgid "STUN Server:"
+msgstr "STUN serveris:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehānisms:"
+msgid "Discover the STUN server automatically"
+msgstr "Atklāt STUN serveri automātiski"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Dažādas opcijas"
+msgid "Discover Binding"
+msgstr "Atklāt saistīšanu"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT šķērsošanas opcijas"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Serveris:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-alive opcijas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Ports:"
+msgid "Mechanism:"
+msgstr "Mehānisms:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Starpniekservera opcijas"
+msgid "Interval (seconds)"
+msgstr "Intervāls (sekundēs)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Autentifikācijas vārds:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transports:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN serveris:"
+msgid "Loose Routing"
+msgstr "Brīvā maršrutēšana"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Serveris:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorēt TLS kļūdas"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transports:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Šo kontu izmantot, _lai zvanītu iekšzemes un mobilajiem tālruņiem"
+msgid "Port:"
+msgstr "Ports:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Kāda ir jūsu SIP konta parole?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Kāds ir jūsu SIP lietotāja ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Lietotājvārds:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Kāda ir jūsu SIP konta parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorēt konferenču un tērzēšanas istabu uzaicinājumus"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Istabu saraksta lokāle:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Kāds ir jūsu Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Kāda ir jūsu Yahoo! parole?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Istabu saraksta lokāle:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1329,61 +1352,65 @@ msgstr "Visi faili"
 msgid "Click to enlarge"
 msgstr "Klikšķiniet, lai palielinātu"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Gadījās kļūda, sākot zvanu"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Norādītais kontakts neatbalsta zvanus"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Norādītais kontakts ir nesaistē"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Norādītais kontakts ir nav derīgs"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Šis protokols neatbalsta ārkārtas zvanus"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Jums nepietiek kredītā, lai veiktu šo zvanu"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Neizdevās izveidot privātu tērzēšanas istabu"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Šai sarunai temats nav atbalstīts"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Jums nav tiesību mainīt tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” nav derīgs kontakta ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: attīrīt visus ziņojumus no šīs sarunas"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temats>: uzlikt tematu šai sarunai"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <istabas ID>: pievienoties jaunai tērzēšanas istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <istabas ID>: pievienoties jaunai tērzēšanas istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1391,23 +1418,23 @@ msgstr ""
 "/part [<istabas ID>] [<iemesls>]: pamest tērzēšanas istabu, pēc noklusēšanas "
 "tā ir pašreizējā"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakta ID> [<ziņojums>]: atvērt privāto tērzēšanu"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakta ID> <ziņojums>: atvērt privāto tērzēšanu"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <iesauka>: mainīt jūsu iesauku uz šī servera"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <darbība>: nosūtīt darbības ziņojumu šajā sarunā"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1417,11 +1444,11 @@ msgstr ""
 "ziņojumu, kurš sākas ar '/'. Piemēram: \"/say /join tiek izmantots, lai "
 "pievienotos jaunai tērzēšanas istabai\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: rādīt informāciju par kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1429,113 +1456,127 @@ msgstr ""
 "/help [<komanda>]: rādīt visas atbalstītās komandas. Ja dota <komanda>, "
 "parādīt tās lietošanu."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Lietojums: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nezināma komanda"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nezināma komanda; /help var parādīt pieejamās komandas"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "nepietiekama bilance, lai nosūtītu ziņojumu"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Kļūda, sūtot ziņojumu '%s': %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Kļūda, sūtot ziņojumu: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"nepietiekama bilance, lai nosūtītu ziņojumu. <a href='%s'>Uzpildīt</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "nav spējīgs"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "nesaistē"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "nederīgs kontakts"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "atļauja liegta"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "pārāk garš ziņojums"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "nav realizēts"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nezināms"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Kļūda, sūtot ziņojumu '%s': %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Kļūda, sūtot ziņojumu: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Temats:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temats ir: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tematu iestatīja %s un tas ir ir: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Temats nav norādīts"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Nav ieteikumu)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Pievienot '%s' vārdnīcai"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Pievienot '%s' vārdnīcai '%s'"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Ievietot smaidiņu"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Sūtīt"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Pareizrakstības ieteikumi"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Neizdevās iegūt pēdējos ierakstus"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ir izgājis"
@@ -1543,12 +1584,12 @@ msgstr "%s ir izgājis"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ņēma un izspēra %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s tika izsperts"
@@ -1556,17 +1597,17 @@ msgstr "%s tika izsperts"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ņēma un izraidīja %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s tika izraidīts"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s pameta istabu"
@@ -1576,17 +1617,17 @@ msgstr "%s pameta istabu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s pievienojās istabai"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s tagad saucas %s"
@@ -1594,90 +1635,90 @@ msgstr "%s tagad saucas %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:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Atvienots"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Vai vēlaties saglabāt šo paroli?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Atcerēties"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne tagad"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Mēģināt vēlreiz"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Nepareiza parole; mēģiniet vēlreiz:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Šī istaba ir aizsargāta ar paroli:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Pievienoties"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Savienots"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Saruna"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Nezināms vai nederīgs identifikators"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Kontaktu bloķēšana pagaidām nepieejama"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Kontaktu bloķēšana ir nepieejama"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Atļauja liegta"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Neizdevās bloķēt kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Rediģēt bloķētos kontaktus"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konts:"
 
@@ -1687,62 +1728,53 @@ msgstr "Bloķētie kontakti"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Izņemt"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Kopēt saites adresi"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Atvērt saiti"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Labot kontakta informāciju"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Personīgā informācija"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Jauns kontakts"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloķēt %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Vai tiešām vēlaties bloķēt '%s' iespēju ar jums sazināties?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloķēt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Ziņot par šo kontaktu kā par aizskarošu"
@@ -1750,401 +1782,316 @@ msgstr[1] "_Ziņot par šo kontaktiem kā par aizskarošiem"
 msgstr[2] "_Ziņot par šo kontaktiem kā par aizskarošiem"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Izlemt vē_lāk"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Pierakstīšanās lūgums"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloķēt lietotāju"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupēts"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Īpašie cilvēki"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Vai tiešām vēlaties izņemt grupu '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Izņem grupu"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Izņemt"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Vai tiešām vēlaties izņemt kontaktu '%s'?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Izņem kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Pievienot kontaktu..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Bloķēt kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Tērzēt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Zvans"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video zvans"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "Ie_priekšējās sarunas"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Sūtīt failu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Dalīties ar manu darbvirsmu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Iecienītais"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mācija"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "R_ediģēt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Aicina jūs uz šo istabu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "Uza_icināt uz tērzēšanas istabu"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Izlemt vē_lāk"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Meklēt kontaktos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Meklēt:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Pievienot kont_aktu"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Kontakti nav atrasti"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Ziņojums, ar kuru iepazīstināt ar sevi:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Lūdzu, ļaujiet man redzēt, kad esat tiešsaistē. Paldies!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Izvēlēties kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Vārds, uzvārds:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Tālruņa numurs:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "E-pasta adrese:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Tīmekļa vietne:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Dzimšanas diena:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Pēdējo reizi redzēts:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Savienojies no:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Ziņa, kad projām:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanāli:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Valsts ISO kods:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Valsts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Stāvoklis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Pilsēta:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Reģions:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Pasta indekss:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Iela:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Ēka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Stāvs:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Istaba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Teksts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Apraksts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Precizitātes līmenis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Kļūda:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Vertikālā kļūda (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Horizontālā kļūda (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Ātrums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Peilējums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Kāpšanas ātrums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Pēdējo reizi atjaunināts:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Garums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Platums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Augstums:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Vieta"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Saglabāt attēlu"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Nevar saglabāt attēlu"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Vieta</b> (datums)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Pseidonīms:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klienta informācija"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klients:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "Personīgā informācija"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Kontakta informācija"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Vārds, uzvārds"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Tālruņa numurs"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "E-pasta adrese"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Tīmekļa vietne"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Dzimšanas diena"
+
+#. 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 "Pēdējo reizi redzēts:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Savienojies no:"
+
+#. 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 "Ziņa, kad projām:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "darbs"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "mājas"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobilais"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "balss"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "vēlamais"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "pasta"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "sainis"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikators:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Pseidonīms:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Vieta</b> (datums)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Informācija pieprasīta..."
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Klienta informācija"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versija:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klients:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupas"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2152,107 +2099,180 @@ msgstr ""
 "Izvēlieties grupas, kurās vēlaties redzēt šo kontaktu. Varat izvēlēties "
 "vienu, vairākas vai nevienu grupu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Pievienot grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izvēlēties"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sekojošais subjekts tiks bloķēts:"
 msgstr[1] "Sekojošie subjekti tiks bloķēti:"
 msgstr[2] "Sekojošie subjekti tiks bloķēti:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Sekojošo subjektu nevar bloķēt:"
 msgstr[1] "Sekojošos subjektus nevar bloķēt:"
 msgstr[2] "Sekojošos subjektus nevar bloķēt:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Labot kontakta informāciju"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Saistītie kontakti"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Izvēlēties kontaktus, ko saistīt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Jauna kontakta priekšskatījums"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakti, kuri ir izvēlēti kreisajā sarakstā tiks sasaistīti"
-
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:345
 msgid "Select account to use to place the call"
 msgstr "Izvēlieties kontu, ko izmantot zvanu veikšanai"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../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 "Zvans"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:414
 msgid "Mobile"
 msgstr "Mobilais"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Work"
 msgstr "Darbs"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "HOME"
 msgstr "Mājas"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "_Bloķēt kontaktu"
+
+#. 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
+msgid "_Chat"
+msgstr "_Tērzēt"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Zvans"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video zvans"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "Ie_priekšējās sarunas"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "Sūtīt failu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "Dalīties ar darbvirsmu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Iecienītais"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts nav instalēts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Lūdzu, uzinstalējiet gnome-contacts, lai piekļūtu sīkākai informācijai par "
+"kontaktu."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "Infor_mācija"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Saistīt kontaktus..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Aicina jūs uz šo istabu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "Uza_icināt uz tērzēšanas istabu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Pievienot kontaktu..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Dzēst un _bloķēt"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Vai tiešām vēlaties izņemt grupu '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Izņem grupu"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Izņemt"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Vai tiešām vēlaties izņemt kontaktu '%s'?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2261,7 +2281,11 @@ msgstr ""
 "Vai tiešām vēlaties izņemt saistīto kontaktu '%s'? Ņemiet vērā, ka tas "
 "izņems visus kontaktus, kuri veido šo saistīto kontaktu."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Izņem kontaktu"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2273,23 +2297,23 @@ msgstr[2] "Saistītais kontakts satur %u kontaktus"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Vieta</b> (datums)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Tiešsaistē no tālruņa vai mobilās ierīces"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Jauns tīkls"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Izvēlieties IRC tīklu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Atstatīt _tīkla sarakstu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Izvēlēties"
@@ -2302,254 +2326,253 @@ msgstr "jauns serveris"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Saistītie kontakti"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "A_tsaistīt..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Redzamo saistīto kontaktu pilnībā sadalīt atsevišķos kontaktos."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Saistīt"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Atsaistīt saistītos kontaktus '%s'?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Vai tiešām vēlaties atsaistīt šos saistītos kontaktus? Tas pilnībā sadalīs "
-"saistītos kontaktus dažādos kontaktos."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "A_tsaistīt"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Vēsture"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Rādīt"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Meklēt"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Tērzēšana %s istabā"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Tērzēšana ar %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
-#| msgid "%s second"
-#| msgid_plural "%d seconds"
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekunde"
 msgstr[1] "%s sekundes"
 msgstr[2] "%s sekunžu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
-#| msgid "%s minute"
-#| msgid_plural "%d minutes"
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minūte"
 msgstr[1] "%s minūtes"
 msgstr[2] "%s minūšu"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Zvans ilga %s, beidzās %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Šodien"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Vakar"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Jebkad"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Jebkurš"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kad"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Jebkas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Teksta tērzēšana"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Ienākošie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Izejošie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Neatbildētie zvani"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Kas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Vai tiešām vēlaties dzēst visu iepriekšējo sarunu žurnālus?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Attīrīt visu"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Dzēst no:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Ielādē...</span>"
+msgid "_File"
+msgstr "_Fails"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Tērzēšana"
+#: ../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 "R_ediģēt"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Dzēst visu vēsturi..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profils"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Tērzēšana"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_ediģēt"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Fails"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "lapa 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Kontakta ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Ielādē...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Tērzēt"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakts ir nesaistē"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Norādītais kontakts ir nav derīgs vai nav zināms"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakts neatbalsta šāda veida sarunas"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Šajā protokolā nav implementēta pieprasītā funkcionalitāte"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Nevarēja uzsākt sarunu ar doto kontaktu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Jūs esat izraidīts no šī kanāla"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Kanāls ir pilns"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Jums jāsaņem uzaicinājums, lai pievienotos šim kanālam"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Nevar turpināt, kamēr ir atvienots"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Atļauja liegta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Gadījās kļūda, sākot sarunu"
+
+#: ../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 "Ievadiet kontakta identifikatoru vai tālruņa numuru:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Jauna saruna"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Sūtīt _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video zvans"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "Zv_anīt"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "Zv_ans"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
-msgstr "Zvans"
+msgstr "Jauns zvans"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Autentifikācija neizdevās kontam <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"
@@ -2586,12 +2609,8 @@ msgstr "Klikšķiniet, lai padarītu šo statusu par iecienīto"
 msgid "Set status"
 msgstr "Iestatīt statusu"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Iestatiet savu klātbūtni un statusu"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Pielāgotās ziņas..."
 
@@ -2599,7 +2618,7 @@ msgstr "Pielāgotās ziņas..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Jauns %s konts"
@@ -2609,20 +2628,20 @@ msgid "Find:"
 msgstr "Meklēt:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Reģis_trjutīgs"
+msgid "_Previous"
+msgstr "Ie_priekšējais"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frāze nav atrasta"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Nākamais"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Reģis_trjutīgs"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "Ie_priekšējais"
+msgid "Phrase not found"
+msgstr "Frāze nav atrasta"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2668,12 +2687,12 @@ msgstr "Balss zvans beidzies"
 msgid "Edit Custom Messages"
 msgstr "Labot pielāgotos ziņojumus"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Ziņojums rediģēts %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normāls"
 
@@ -2750,34 +2769,39 @@ msgid "Certificate hostname: %s"
 msgstr "Sertifikāta datora nosaukums: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Turpināt"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "T_urpināt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Neuzticams savienojums"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Šis savienojums nav uzticams. Vai tomēr vēlaties turpināt?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Atcerēties šo izvēli turpmākajiem savienojumiem"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Sertifikāta detaļas"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Nevar atvērt URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Izvēlieties failu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Nepietiek brīvās vietas, lai saglabātu failu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2786,7 +2810,7 @@ msgstr ""
 "Ir nepieciešami %s brīvas vietas, lai saglabātu šo failu, bet ir pieejami "
 "tikai %s. Lūdzu, izvēlieties citu vietu."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Ienākošais fails no %s"
@@ -2958,39 +2982,31 @@ msgstr "Rietumu"
 msgid "Vietnamese"
 msgstr "Vjetnamiešu"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Izvēlētais kontakts nevar saņemt failus."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Izvēlētais kontakts ir nesaistē."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nav kļūdas paziņojuma"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Tūlītējs ziņojums (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Nepieslēgties automātiski"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Pēc palaišanas nerādīt kontaktu sarakstu vai kādus citus dialogus"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy TZ klients"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Kļūda, sazinoties ar konta pārvaldnieku"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3038,232 +3054,94 @@ msgstr ""
 "Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  "
 "02111-1307  USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Tūlītējās ziņojumapmaiņas klients GNOME videi"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Raivis Dejus <orvils@gmail.com>\n"
 "Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Anita Reitere <nitalynx@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Gadījās kļūda, importējot kontus."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Gadījās kļūda, analizējot konta informāciju."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Gadījās kļūda, veidojot kontu."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Ir notikusi kļūda."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Kļūdas paziņojums: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Jūs varat atgriezties un ievadīt konta informāciju vēlreiz, vai arī iziet no "
-"šī palīga un pievienot kontus vēlāk, izmantojot Rediģēšanas izvēlni."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Notika kļūda"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Kāda veida tērzēšanas konts jums ir?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Vai vēlaties iestatīt vēl citus tērzēšanas kontus?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Ievadiet sava konta informāciju"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Kāda veida tērzēšanas kontu vēlaties izveidot?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Vai vēlaties izveidot citus tērzēšanas kontus?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Ievadiet sava jaunā konta informāciju"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Ar Empathy jūs varat tērzēt ar tuvumā esošiem cilvēkiem, kā arī ar draugiem "
-"un kolēģiem, kuri izmanto Google Talk, AIM, Windows Live un daudzas citas "
-"tērzēšanas programmas. Ar mikrofonu un tīmekļa kameru jūs varat veikt arī "
-"audio un video zvanus."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Vai jums ir konti, kurus izmantojat ar citu tērzēšanas programmu?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Jā, es vēlos importēt manu konta informāciju no "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Jā, es tagad ievadīšu sava konta informāciju"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nē, es vēlos veidot jaunu kontu"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nē, es pagaidām vēlos tikai redzēt tuvumā atrodamos cilvēkus"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Izvēlieties kontus, kurus vēlaties importēt:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Jā"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nē, pagaidām tas ir viss"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy var automātiski atrast tērzēšanai cilvēkus jūsu lokālajā tīklā. Ja "
-"vēlaties lietot šo iespēju, lūdzu, pārliecinieties, ka norādītās detaļas ir "
-"pareizas. Vēlāk jūs tās varat viegli izmainīt vai atslēgt šo iespēju, "
-"izmantojot dialogu 'Konti'."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Rediģēt->Konti"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Es pagaidām _nevēlos ieslēgt šo iespēju"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Neizdosies tērzēt ar cilvēkiem lokālajā tīklā, jo telepathy-salut nav "
-"instalēts. Ja vēlaties ieslēgt šo iespēju, lūdzu, instalējiet telepathy-"
-"salut pakotni un izveidojiet atbilstošo kontu Kontu dialogā"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut nav instalēts"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Ziņojumapmaiņas un IP balss pārraides kontu asistents"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Laipni lūdzam Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importēt jau esošos kontus"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Lūdzu, ievadiet savus datus"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Kontam %s ir nesaglabātas izmaiņas."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Jaunais konts vēl nav saglabāts."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Savienojas..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Nesaistē — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Atvienots — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Nesaistē — nav tīkla savienojuma"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nezināms statuss"
 
-#: ../src/empathy-accounts-dialog.c:428
-msgid "Offline — Account Disabled"
-msgstr "Nesaistē — konts atslēgts"
-
-#: ../src/empathy-accounts-dialog.c:831
+#: ../src/empathy-accounts-dialog.c:458
 msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
 msgstr ""
-"Jūs tūlīt izveidosiet jaunu kontu, kas izmetīs jūsu izmaiņas.\n"
-"Vai tiešām vēlaties turpināt?"
+"Šis konts tika deaktivēts, ko tas balstās uz vecu un neatbalstītu aizmuguri. "
+"Lūdzu, uzinstalējiet telepathy-haze un pārstartējiet sesiju, lai migrētu šo "
+"kontu."
+
+#: ../src/empathy-accounts-dialog.c:468
+msgid "Offline — Account Disabled"
+msgstr "Nesaistē — konts deaktivēts"
+
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Rediģēt savienojuma parametrus"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Neizdevās saņemt jūsu personīgo informāciju no servera."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Dodieties tiešsaistē, lai rediģētu savu personīgo informāciju."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "R_ediģēt savienojuma parametrus..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vai vēlaties izņemt %s no sava datora?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Tas neizņems jūsu kontu no servera."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3272,15 +3150,24 @@ msgstr ""
 "Vai tiešām vēlaties turpināt?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "I_eslēgt"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Atslēgt"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "Izlai_st"
+
+#: ../src/empathy-accounts-dialog.c:2130
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "_Savienoties"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3292,19 +3179,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Pievienot..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Ielādē konta informāciju"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Protokols nav uzinstalēts"
+msgid "_Import…"
+msgstr "_Importēt..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokols:"
+msgid "Loading account information"
+msgstr "Ielādē konta informāciju"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3312,132 +3195,117 @@ msgstr ""
 "Lai izveidotu jaunu kontu, vispirms jāinstalē aizmugure katram protokolam, "
 "kuru vēlaties izmantot."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importēt..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "Protokola aizmugure nav uzinstalēta"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Empathy autentifikācijas klients"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy autentifikācijas klients"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Tuvumā esošie cilvēki"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy audio/video klients"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy audio/video klients"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrasts"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Spilgtums"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Skaļums"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Sānjosla"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Audio ievade"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video ievade"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Ciparnīca"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Sīkāka informācija"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Zvans ar %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP adrese, kuru redz dators"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adrese, kuru redz serveris Internetā"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adrese, kuru redz biedrs otrā galā"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Translēšanas servera IP adrese"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Multiraides grupas IP adreses"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nezināms"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nezināms"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nezināms"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nezināms"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Savienojies — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tehniskā informācija"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3446,8 +3314,8 @@ msgstr ""
 "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
 "audio formātiem"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3456,8 +3324,8 @@ msgstr ""
 "Programmatūra, ko lieto %s, nesaprot nevienu no jūsu sistēmas atbalstītajiem "
 "video formātiem"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3466,25 +3334,25 @@ msgstr ""
 "Nevar izveidot savienojumu ar %s. Iespējams, ka viens no jums atrodas tīklā, "
 "kurā nav atļauti tiešie savienojumi."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Gadījās tīkla kļūme"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "Šim zvanam vajadzīgie audio formāti nav instalēti jūsu datorā"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "Šim zvanam vajadzīgie video formāti nav instalēti jūsu datorā"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3495,161 +3363,213 @@ msgstr ""
 "\">ziņojiet par šo kļūdu</a>, pievienojot ierakstus no 'Atkļūdot' loga "
 "Palīdzības izvēlnē."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Zvanu dzinī gadījās kļūme"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Tika sasniegtas plūsmas beigas"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Nevar izveidot audio plūsmu"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Nevar izveidot video plūsmu"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Zvanīt"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Atkodēšanas kodeks:"
+msgid "_Microphone"
+msgstr "_Mikrofons"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Atslēgt kameru"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Rādīt ciparnīcu"
+msgid "_Settings"
+msgstr "Ie_statījumi"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Iekodēšanas kodeks:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Skats"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Nolikt klausuli"
+#: ../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 "_Palīdzība"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Beigt šo zvanu"
+#: ../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 "_Saturs"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokālais kandidāts:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Atkļūdot"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maksimizēt mani"
+msgid "Swap camera"
+msgstr "Mainīt kameru"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizēt mani"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Attālinātais kandidāts:"
+msgid "Maximise me"
+msgstr "Maksimizēt mani"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Sūtīt audio"
+msgid "Disable camera"
+msgstr "Atslēgt kameru"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Sūtīt video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Nolikt klausuli"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Rādīt ciparnīcu"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Beigt šo zvanu"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video zvans"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Sākt video zvanu"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Sākt audio zvanu"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Mainīt kameru"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Pārslēgt audio pārraidi"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Pārslēgt video pārraidi"
+msgid "Show dialpad"
+msgstr "Rādīt ciparnīcu"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "Nezināms"
+msgid "Display the dialpad"
+msgstr "Rādīt ciparnīcu"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Sūtīt video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video zvans"
+msgid "Toggle video transmission"
+msgstr "Pārslēgt video pārraidi"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Zvanīt"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Sūtīt audio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Saturs"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Pārslēgt audio pārraidi"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Atkļūdot"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Iekodēšanas kodeks:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Palīdzība"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nezināms"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Atkodēšanas kodeks:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofons"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Attālinātais kandidāts:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Ie_statījumi"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokālais kandidāts:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Skats"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Aizvērt šo logu?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Šī loga aizvēršana pametīs %s. Jūs nesaņemsiet jaunus ziņojumus, kamēr atkal "
+"nepievienosities."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Šī loga aizvēršana pametīs %u tērzēšanas istabu. Jūs nesaņemsiet jaunus "
+"ziņojumus, kamēr atkal nepievienosities."
+msgstr[1] ""
+"Šī loga aizvēršana pametīs %u tērzēšanas istabas. Jūs nesaņemsiet jaunus "
+"ziņojumus, kamēr atkal nepievienosities."
+msgstr[2] ""
+"Šī loga aizvēršana pametīs %u tērzēšanas istabas. Jūs nesaņemsiet jaunus "
+"ziņojumus, kamēr atkal nepievienosities."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Pamest %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Jūs nesaņemsiet jaunus ziņojumus no šīs tērzēšanas istabas, kamēr atkal "
+"nepievienosities."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Aizvērt logu"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Pamest istabu"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3657,7 +3577,7 @@ msgstr[0] "%s (%d nelasīts)"
 msgstr[1] "%s (%d nelasīti)"
 msgstr[2] "%s (%d nelasīti)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3665,7 +3585,7 @@ msgstr[0] "%s (un %u cits)"
 msgstr[1] "%s (un %u citi)"
 msgstr[2] "%s (un %u citi)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3673,7 +3593,7 @@ msgstr[0] "%s (%d nelasīts no citiem)"
 msgstr[1] "%s (%d nelasīti no citiem)"
 msgstr[2] "%s (%d nelasīti no citiem)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3681,11 +3601,11 @@ msgstr[0] "%s (%d nelasīts no visiem)"
 msgstr[1] "%s (%d nelasīti no visiem)"
 msgstr[2] "%s (%d nelasīti no visiem)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3693,69 +3613,69 @@ msgstr[0] "Sūta %d ziņojumu"
 msgstr[1] "Sūta %d ziņojumus"
 msgstr[2] "Sūta %d ziņojumu"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Raksta ziņojumu."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "At_tīrīt"
+msgid "_Conversation"
+msgstr "_Saruna"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakts"
+msgid "C_lear"
+msgstr "At_tīrīt"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ievietot _smaidiņu"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Iecienītā tērzēšanas istaba"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Ielūgt _dalībnieku..."
+msgid "Notify for All Messages"
+msgstr "Ziņot par visiem ziņojumiem"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Pārvietot ci_lni pa kreisi"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Rādīt kontaktu _sarakstu"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Pā_rvietot cilni pa labi"
+msgid "Invite _Participant…"
+msgstr "Ielūgt _dalībnieku..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Ziņot par visiem ziņojumiem"
+msgid "C_ontact"
+msgstr "K_ontakts"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Saruna"
+msgid "_Tabs"
+msgstr "_Cilnes"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "At_dalīt cilni"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Iecienītā tērzēšanas istaba"
+msgid "_Previous Tab"
+msgstr "_Iepriekšējā cilne"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Nākamā cilne"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Iepriekšējā cilne"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Atsa_ukt cilnes aizvēršanu"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Rādīt kontaktu _sarakstu"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Pārvietot ci_lni pa kreisi"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Cilnes"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Pā_rvietot cilni pa labi"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Atsa_ukt cilnes aizvēršanu"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "At_dalīt cilni"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3769,100 +3689,100 @@ msgstr "Istaba"
 msgid "Auto-Connect"
 msgstr "Automātiski savienoties"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Pārvaldīt iecienītās istabas"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Ienākošais video zvans"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Ienākošais zvans"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s piedāvā video zvanu. Vai vēlaties atbildēt?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s jums zvana. Vai vēlaties atbildēt?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../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 "Ienākošais zvans no %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "No_raidīt"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Atbildēt"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Atbildēt ar video"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../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 "Ienākošais video zvans no %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Istabas ielūgums"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Ielūgums pievienoties %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s jūs ielūdz pievienoties %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "Norai_dīt"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Pievienoties"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s jūs ielūdza pievienoties %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Jūs ielūdza pievienoties %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Pienāk fails no %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Nepieciešama parole"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s vēlas saņemt atļauju redzēt tavu tiešsaistes statusu"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3872,105 +3792,105 @@ msgstr ""
 "Ziņojums: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s no %s ar ātrumu %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s no %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Saņem \"%s\" no %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Sūta \"%s\" lietotājam %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Kļūda, saņemot \"%s\" no %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Kļūda, saņemot failu"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Kļūda, sūtot \"%s\" lietotājam %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Kļūda, sūtot failu"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" saņemts no %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" aizsūtīts lietotājam %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Faila pārsūtīšana pabeigta"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Gaida otra dalībnieka atbildi"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Pārbauda \"%s\" integritāti"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Jauc \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Fails"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Atlicis"
 
@@ -3983,7 +3903,12 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr ""
 "Izņemt pabeigtos, atceltos un neizdevušos failu pārsūtījumus no saraksta"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "_Importēt"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3991,171 +3916,196 @@ msgstr ""
 "Nav atrasti importējamie konti. Empathy pagaidām atbalsta tikai Pidgin kontu "
 "importēšanu."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importēt kontus"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importēt"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokols"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Avots"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Piedāvāt paroli"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Atvienot"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Lai šeit redzētu kontaktus, jāiestata konts."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nav atrastu rezultātu"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Diemžēl %s kontus nevar izmantot, kamēr %s programmatūra nav atjaunināta."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Atjaunināt programmatūru..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Aizvērt"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Savienoties atkal"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Rediģēt kontu"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Aizvērt"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Uzpildīt %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Uzpildīt konta kredītu"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Uzpildīt ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakts"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Lai šeit redzētu kontaktus, jums jāaktivē kāds no saviem kontiem."
+
+#. 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 "Lai šeit redzētu kontaktus, jums jāaktivē %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktu saraksts"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakti uz _kartes"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Konta iestatījumi"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Kredīta bilance"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Jau_na saruna..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Mek_lēt kontaktu sarakstā"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Jauns _zvans..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pievienoties _iecienītajām"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Meklēt kontaktu..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Pārvaldīt iecienītās"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Failu pārsūtīšana"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormāls izmērs"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Nesaistes k_ontakti"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Jauns _zvans..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "_Rādīt protokolus"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normāls izmērs ar _attēliem"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Kredīta bilance"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakti uz _kartes"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Konti"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Bloķētie kontakti"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Iestatījumi"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "_Rādīt protokolus"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Mek_lēt kontaktu sarakstā"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Kārtot pēc _vārda"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Kārtot pēc _statusa"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Konti"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normāls izmērs ar _attēliem"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Bloķētie kontakti"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormāls izmērs"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompakts izmērs"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Failu pārsūtīšana"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Istaba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Pievienoties..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Jau_na saruna..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nesaistes k_ontakti"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personīgā informācija"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Istaba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Pievienoties _iecienītajām"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Meklēt kontaktu..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Pārvaldīt iecienītās"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Tērzēšanas istaba"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Dalībnieki"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4168,22 +4118,27 @@ msgstr ""
 "Nepieciešama parole: %s\n"
 "Dalībnieki: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Jā"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nē"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Neizdevās palaist istabu izdruku"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Neizdevās apstādināt istabu izdruku"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Neizdevās ielādēt istabu sarakstu"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pievienoties istabai"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4192,6 +4147,10 @@ msgstr ""
 "Ierakstiet šeit istabas vārdu, kurai pievienoties, vai klikšķiniet sarakstā."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Istaba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4199,180 +4158,196 @@ msgstr ""
 "Ievadiet serveri, kurš uztur istabu, vai arī atstājiet tukšu, ja istaba ir "
 "uz pašreizējā konta servera"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pievienoties istabai"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Neizdevās ielādēt istabu sarakstu"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Istabu saraksts"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Istaba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Ziņojums saņemts"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Ziņojums nosūtīts"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Jauna saruna"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Kontakts parādās tiešsaistē"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakts devies nesaistē"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Konts savienots"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Konts atvienots"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Valoda"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Spīdola"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Lāčplēsis"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Lāčplēsi, mainies uz augšu, ne šis ir tavs darbs!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Tev lielāks darbs: priekš tautas dzīvot, ne mirt!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ar viltu tie kaitina tevi uz cīņu!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Mainoties uz augšu, tu likteni pārspēsi!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Es lūstu, kad mainos; es gatavs no sākta gala."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Spīdola izgāja"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Iestatījumi"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Rādīt _smaidiņus kā bildes "
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Rādīt kontaktu _sarakstu istabās"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Izskats"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Uzvedība"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Sākt tērzēšanu:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Tērzēšanas t_ēma:"
+msgid "new ta_bs"
+msgstr "jaunās _cilnēs"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Atslēgt paziņojumus, kad prom vai _aizņemts"
+msgid "new _windows"
+msgstr "jaunos _logos"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Atslēgt skaņu, kad prom vai _aizņemts"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Rādīt ienākošos notikumus paziņojumu laukā"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Automātiski savienoties palaižoties "
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Atbalss atcelšana palīdz padarīt balss skaņu skaidrāku otrai personai, bet "
-"var radīt problēmas uz dažiem datoriem. Ja jūs vai kāds cits zvana laikā "
-"dzird dīvainas skaņas vai citas problēmas, pamēģiniet izslēgt atbalss "
-"atcelšanu un pārstartējiet zvanu."
+msgid "Log conversations"
+msgstr "Reģistrēt sarunas"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Ieslēgt paziņojumus, kad kontakts parādās tiešsaistē"
+msgid "Behavior"
+msgstr "Uzvedība"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Ieslēgt paziņojumus, kad kontakts dodas nesaistē"
+msgid "General"
+msgstr "Vispārīgi"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Ieslēgt paziņojumus, kad _tērzēšana nav fokusēta"
+msgid "_Enable bubble notifications"
+msgstr "I_eslēgt burbuļpaziņojumus"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Ieslēgt pareizrakstības pārbaudi valodai:"
+msgid "Disable notifications when _away or busy"
+msgstr "Atslēgt paziņojumus, kad prom vai _aizņemts"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Vispārīgi"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Ieslēgt paziņojumus, kad _tērzēšana nav fokusēta"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ievades līmenis:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Ieslēgt paziņojumus, kad kontakts parādās tiešsaistē"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Ievades skaļums:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Ieslēgt paziņojumus, kad kontakts dodas nesaistē"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Paziņojumi"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Vietas avoti:"
+msgid "_Enable sound notifications"
+msgstr "I_eslēgt skaņas paziņojumus"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Reģistrēt sarunas"
+msgid "Disable sounds when _away or busy"
+msgstr "Atslēgt skaņu, kad prom vai _aizņemts"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Paziņojumi"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Atskaņot skaņu pie notikumiem"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Skaņas"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privātums"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Li_etot atbalss atcelšanu, lai uzlabotu zvana kvalitāti"
 
 #: ../src/empathy-preferences.ui.h:23
 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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Atbalss atcelšana palīdz padarīt balss skaņu skaidrāku otrai personai, bet "
+"var radīt problēmas uz dažiem datoriem. Ja jūs vai kāds cits zvana laikā "
+"dzird dīvainas skaņas vai citas problēmas, pamēģiniet izslēgt atbalss "
+"atcelšanu un pārstartējiet zvanu."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Parādīt kontaktiem atrašanās vietu"
+
+#: ../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."
@@ -4381,190 +4356,198 @@ msgstr ""
 "štats un valsts netiks publicēts. GPS koordinātes būs precīzas līdz vienai "
 "zīmei aiz komata."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Rādīt _smaidiņus kā bildes "
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Rādīt kontaktu _sarakstu istabās"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Skaņas"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Pareizrakstības pārbaude"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Valodu saraksts rāda tikai tās valodas, kurām ir instalētas vārdnīcas."
-
+#. 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 "Themes"
-msgstr "Tēmas"
+msgid "_Reduce location accuracy"
+msgstr "Samazināt atrašanās vietas p_recizitāti"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Variants:"
+msgid "Privacy"
+msgstr "Privātums"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Automātiski savienoties palaižoties "
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilais tālrunis"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "I_eslēgt burbuļpaziņojumus"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Tīkls (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "I_eslēgt skaņas paziņojumus"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Vietas avoti:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Tīkls (IP, Wi-Fi)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Valodu saraksts rāda tikai tās valodas, kurām ir instalētas vārdnīcas."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "Atvērt jaunas sarakstes atsevišķos l_ogos"
+msgid "Enable spell checking for languages:"
+msgstr "Ieslēgt pareizrakstības pārbaudi valodai:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "_Parādīt kontaktiem atrašanās vietu"
+msgid "Spell Checking"
+msgstr "Pareizrakstības pārbaude"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "Tērzēšanas t_ēma:"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "Samazināt atrašanās vietas p_recizitāti"
+msgid "Variant:"
+msgstr "Variants:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Tēmas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Statuss"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Iziet"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Zvanīt kontaktam vēlreiz"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Izslēgt kameru"
+msgid "Redial"
+msgstr "Zvanīt atkal"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Ieslēgt kameru"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Izslēgt video"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Atslēgt kameru un pārstāt sūtīt video"
+msgid "Video Preview"
+msgstr "Video priekšskatījums"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Ieslēgt kameru un sūtīt video"
+msgid "Video On"
+msgstr "Ieslēgt video"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Ieslēgt kameru, bet nesūtīt video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Zvanīt kontaktam vēlreiz"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Priekšskatījums"
+msgid "Camera Off"
+msgstr "Izslēgt kameru"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Zvanīt atkal"
+msgid "Disable camera and stop sending video"
+msgstr "Atslēgt kameru un pārstāt sūtīt video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Priekšskatījums"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Izslēgt video"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Ieslēgt kameru, bet nesūtīt video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Ieslēgt video"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Ieslēgt kameru"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Video priekšskatījums"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Ieslēgt kameru un sūtīt video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kontaktu kartes skats"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Saglabāt"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin saite"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin atbilde"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Datu ir pārāk daudz, lai ielīmētu vienā solī. Lūdzu, saglabājiet žurnālu "
+"failā."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Atkļūdošanas logs"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Sūtīt uz pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Līmenis "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Atkļūdošanas"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informācijas"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Paziņojuma"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Brīdinājuma"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritiskais"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Kļūdas"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Laiks"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domēns"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Līmenis"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4572,133 +4555,435 @@ msgstr ""
 "Izvēlētais savienojumu pārvaldnieks neatbalsta attālināto atkļūdošanas "
 "paplašinājumu."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Ielūgt dalībnieku"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izvēlieties kontaktu, ko aicināt uz sarunu:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Uzaicināt"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Nerādīt nekādus dialogus; izdarīt darāmo (piemēram, importēšanu) un iziet"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Nerādīt nekādus dialogus, izņemot, ja ir tikai \"Tuvumā esošie cilvēki\" "
 "konti"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Sākumā izvēlēties doto kontu (piemēram, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konta-ID>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr " - Empathy konti"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy konti"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Rādīt noteiktu servisu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Empathy atkļūdotājs"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy atkļūdotājs"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy tērzēšanas klients"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Atbildēt"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Noraidīt"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Atbildēt"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Atbildēt ar video"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Noraidīt"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Pieņemt"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Piedāvāt"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tikko mēģināja piezvanīt, bet jūs jau piedalījāties citā sarunā."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Aizturēts"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Apklusināt"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Ilgums"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Jūsu pašreizējā bilance ir %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Diemžēl jums nepietiek kredīta, lai veiktu šo zvanu."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Uzpildīt"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Reģistru sakritība"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Kāda veida tērzēšanas konts jums ir?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Jauna kontu pievienošana"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Tuvumā esošie cilvēki"
+
+#: ../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 var automātiski atrast tērzēšanai cilvēkus jūsu lokālajā tīklā. Ja "
+"vēlaties lietot šo iespēju, lūdzu, pārliecinieties, ka norādītā informācija "
+"ir "
+"pareiza"
+
+#: ../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 ""
+"Jūs varat mainīt šo informāciju vēlāk vai deaktivēt šo iespēju, izvēloties "
+"<span style=\"italic\">Rediģēt → Konti</span> kontaktu sarakstā."
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izvēlēties kontaktus, ko saistīt"
+
+#~ msgid "New contact preview"
+#~ msgstr "Jauna kontakta priekšskatījums"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Kontakti, kuri ir izvēlēti kreisajā sarakstā tiks sasaistīti"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Saistīt kontaktus..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Saistītie kontakti"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "A_tsaistīt..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Redzamo saistīto kontaktu pilnībā sadalīt atsevišķos kontaktos."
+
+#~ msgid "_Link"
+#~ msgstr "_Saistīt"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Atsaistīt saistītos kontaktus '%s'?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Vai tiešām vēlaties atsaistīt šos saistītos kontaktus? Tas pilnībā "
+#~ "sadalīs saistītos kontaktus dažādos kontaktos."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "A_tsaistīt"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Gadījās kļūda, importējot kontus."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Gadījās kļūda, analizējot konta informāciju."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Gadījās kļūda, veidojot kontu."
+
+#~ msgid "There was an error."
+#~ msgstr "Ir notikusi kļūda."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Kļūdas paziņojums: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Jūs varat atgriezties un ievadīt konta informāciju vēlreiz, vai arī iziet "
+#~ "no šī palīga un pievienot kontus vēlāk, izmantojot Rediģēšanas izvēlni."
+
+#~ msgid "An error occurred"
+#~ msgstr "Notika kļūda"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Vai vēlaties iestatīt vēl citus tērzēšanas kontus?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Ievadiet sava konta informāciju"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Kāda veida tērzēšanas kontu vēlaties izveidot?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Vai vēlaties izveidot citus tērzēšanas kontus?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Ievadiet sava jaunā konta informāciju"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Ar Empathy jūs varat tērzēt ar tuvumā esošiem cilvēkiem, kā arī ar "
+#~ "draugiem un kolēģiem, kuri izmanto Google Talk, AIM, Windows Live un "
+#~ "daudzas citas tērzēšanas programmas. Ar mikrofonu un tīmekļa kameru jūs "
+#~ "varat veikt arī audio un video zvanus."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Vai jums ir konti, kurus izmantojat ar citu tērzēšanas programmu?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Jā, importēt konta informāciju no"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Jā, es tagad ievadīšu sava konta informāciju"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nē, es vēlos veidot jaunu kontu"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nē, es pagaidām vēlos tikai redzēt tuvumā atrodamos cilvēkus"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izvēlieties kontus, kurus vēlaties importēt:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nē, pagaidām tas ir viss"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Rediģēt->Konti"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Es pagaidām _nevēlos ieslēgt šo iespēju"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Neizdosies tērzēt ar cilvēkiem lokālajā tīklā, jo telepathy-salut nav "
+#~ "instalēts. Ja vēlaties ieslēgt šo iespēju, lūdzu, instalējiet telepathy-"
+#~ "salut pakotni un izveidojiet atbilstošo kontu Kontu dialogā"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Ziņojumapmaiņas un IP balss pārraides kontu asistents"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Laipni lūdzam Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importēt jau esošos kontus"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Lūdzu, ievadiet savus datus"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokols:"
+
+#~| msgid "Show Balance in contact list"
+#~ msgid "Show account assistant"
+#~ msgstr "Rādīt kontu asistentu"
+
+#~ msgid "Call volume"
+#~ msgstr "Zvana skaļums"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Zvana skaļums, izteikts procentos."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy ir pārnesusi butterfly žurnālus"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Vai Empathy ir pārnesusi butterfly žurnālus."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Ligzdas tips nav atbalstīts"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Mani tīmekļa konti"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Konts %s tika rediģēts ar %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Kontu %s nevar rediģēt, izmantojot Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Palaist \"Mani tīmekļa konti\""
+
+#~ msgid "Edit %s"
+#~ msgstr "Rediģēt %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "A_tcelt"
+
+#~ msgid "Personal Information"
+#~ msgstr "Personīgā informācija"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupēts"
+
+#~ msgid "Favorite People"
+#~ msgstr "Īpašie cilvēki"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "R_ediģēt"
+
+#~ msgid "Select a contact"
+#~ msgstr "Izvēlēties kontaktu"
+
+#~ msgid "Contact ID:"
+#~ msgstr "Kontakta ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "_Tērzēt"
+
+#~ msgid "Send _Video"
+#~ msgstr "Sūtīt _video"
+
+#~ msgid "C_all"
+#~ msgstr "Zv_anīt"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Iestatiet savu klātbūtni un statusu"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Izvēlētais kontakts nevar saņemt failus."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Izvēlētais kontakts ir nesaistē."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Jūs tūlīt izveidosiet jaunu kontu, kas izmetīs jūsu izmaiņas.\n"
+#~ "Vai tiešām vēlaties turpināt?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezināms"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezināms"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezināms"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nezināms"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personīgā informācija"
+
+#~ msgid "Input level:"
+#~ msgstr "Ievades līmenis:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Ievades skaļums:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "Atvērt jaunas sarakstes atsevišķos l_ogos"
+
 #~ msgid "Find Next"
 #~ msgstr "Meklēt nākamo"
 
diff --git a/po/nb.po b/po/nb.po
index b35b7a09a..53ddba817 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,4 +1,4 @@
-# Norwegian (bokmål) translation of empathy.
+# Norwegian bokmål translation of empathy.
 # Copyright © 2003-2005 Free Software Foundation, Inc.
 # Kjartan Maraas <kmaraas@gnome.org>, 2003-2012.
 # Sigurd Gartmann <sigurdga@yahoo-inc.com>, 2005, 2006.
@@ -7,16 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-16 17:05+0100\n"
-"PO-Revision-Date: 2012-01-16 17:07+0100\n"
+"POT-Creation-Date: 2012-03-12 18:24+0100\n"
+"PO-Revision-Date: 2012-03-12 18:26+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: no\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -34,6 +33,16 @@ msgstr "Empathy internettmeldinger"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "Prat på Google Talk, Facebook, MSN og mange andre pratetjenester"
 
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Meldings- og VoIP-kontoer"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Håndter meldings- og VoIP-kontoer"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Connection managers should be used"
 msgstr "Tilkoblingshåndterer skal brukes"
@@ -71,75 +80,85 @@ msgid "The default folder to save file transfers in."
 msgstr "Forvalgt mappe for lagring av filoverføringer."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magisk nummer som brukes til å sjekke om oppryddingsoppgaver skal kjøres"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+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."
+msgstr "empathy-sanity-cleaning.c bruker dette tallet til å sjekke om oppryddingsoppgaver skal kjøres eller ikke. Brukere skal ikke endre dette manuelt."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Show offline contacts"
 msgstr "Vis frakoblede kontakter"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "Om kontakter som er frakoblet skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Show avatars"
 msgstr "Vis personbilder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "Om bilder av kontakter skal vises i kontaktlisten og samtalevinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Show protocols"
 msgstr "Vis protokoller"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "Om protokoller for kontakter skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Show Balance in contact list"
 msgstr "Vis saldo i kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Whether to show account balances in the contact list."
 msgstr "Om saldo for konto skal vises i kontaktlisten."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Compact contact list"
 msgstr "Kompakt kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Whether to show the contact list in compact mode."
 msgstr "Om kontaktlisten skal vises i kompakt modus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Hide main window"
 msgstr "Skjul hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Hide the main window."
 msgstr "Skjul hovedvinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Default directory to select an avatar image from"
 msgstr "Forvalgt mappe for personbilde"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "The last directory that an avatar image was chosen from."
 msgstr "Den forrige mappen et personbilde ble valgt fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Open new chats in separate windows"
 msgstr "Åpne nye samtaler i egne vinduer"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Always open a separate chat window for new chats."
 msgstr "Alltid åpne et eget vindu til nye samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Display incoming events in the status area"
 msgstr "Vis innkommende hendelser i statusområdet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -147,125 +166,133 @@ msgstr ""
 "Vis innkommende hendelser i statusområdet. Hvis denne er «false» vises disse "
 "til bruker med det samme."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "The position for the chat window side pane"
 msgstr "Posisjon for pratevinduets sidelinje"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "Lagret posisjon (i pikselr) for pratevinduets sideområde."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Show contact groups"
+msgstr "Vis kontaktgrupper"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to show groups in the contact list."
+msgstr "Om kontaktgrupper skal vises i kontaktlisten."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Contact list sort criterion"
 msgstr "Sorteringskriterier for kontaktliste"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "Hvilke kriterier som skal brukes ved sortering av kontaktlisten. Forvalg er "
-"å sortere kontakter etter verdien «name». Hvis man bruker «state» vil "
-"kontaktlisten sorteres etter kontaktens tilstand."
+"å sortere kontakter etter kontaktens tilstand med verdien «state». Hvis man "
+"bruker «name» vil kontaktlisten sorteres etter kontaktens navn."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Use notification sounds"
 msgstr "Bruk varslingslyder"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Whether to play a sound to notify of events."
 msgstr "Om lyder skal spilles av for å varsle om hendelser."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Disable sounds when away"
 msgstr "Slå av lyder når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Whether to play sound notifications when away or busy."
 msgstr "Om lyder skal spilles av når du er borte eller opptatt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Spill av lyd når meldinger kommer inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "Om lyder skal spilles av for å varsle om innkommende meldinger."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Spill av lyd for utgående meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "Om lyder skal spilles av for å varsle om utgående meldinger."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound for new conversations"
 msgstr "Spill av lyd ved nye samtaler"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "Om lyder skal spilles av for å varsle om nye samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs in"
 msgstr "Spill av lyd når kontakter logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr ""
 "Om en lyd skal spilles av for å varsle om at kontakter logger inn på "
 "nettverket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when a contact logs out"
 msgstr "Spill av lyd når kontakter logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr ""
 "Om en lyd skal spilles av for å varsle at kontakter logger ut av nettverket."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log in"
 msgstr "Spill av lyd når du logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Whether to play a sound when logging into a network."
 msgstr "Om lyder skal spilles av når du logger inn på et nettverk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Play a sound when we log out"
 msgstr "Spill av lyd når du logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Whether to play a sound when logging out of a network."
 msgstr "Om lyder skal spilles av når du logger ut av et nettverk."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Enable popup notifications for new messages"
 msgstr "Aktiver varsling oppsprettmeldinger for nye meldinger"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "Om varsling skal vises når en ny melding mottas."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Disable popup notifications when away"
 msgstr "Slå av varsling når du er borte"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether to show popup notifications when away or busy."
 msgstr "Om varsling skal vises når du er borte eller opptatt."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "Vis varsling når prat ikke er fokusert"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -273,105 +300,117 @@ msgstr ""
 "Om varsling skal vises når en melding mottas selv om pratevinduet er åpent "
 "men ikke har fokus."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Pop up notifications when a contact logs in"
 msgstr "Vis varsling når en kontakt logger inn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "Om et varsel skal vises når en kontakt er kobler fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Pop up notifications when a contact logs out"
 msgstr "Vis varsling når en kontakt logger ut"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "Om varsel skal vises når en kontakt kobler fra."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Vis smilefjes grafisk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "Om smilefjes skal konverteres til grafiske bilder i samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Show contact list in rooms"
 msgstr "Vis kontaktliste i rom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether to show the contact list in chat rooms."
 msgstr "Om kontaktlisten skal vises i praterom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Chat window theme"
 msgstr "Tema for samtalevindu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "Temaet som brukes til å vise samtaler."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Chat window theme variant"
 msgstr "Temavariant for samtalevindu"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "Temavariant som brukes til å vise samtale i pratevinduer."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Path of the Adium theme to use"
 msgstr "Sti til Adium-tema som skal brukes"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../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."
 msgstr "Sti til Adium-tema skal brukes hvis tema for prat er Adium."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Enable WebKit Developer Tools"
 msgstr "Slå på utviklerverktøy for WebKit"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Om utviklerverktøy for WebKit, som Web Inspector, skal slås på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informer andre brukere når du skriver til dem"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Hvorvidt tilstand for «skriver» eller «pause» i prat skal sendes. Påvirker "
+"ikke status «borte»."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Use theme for chat rooms"
 msgstr "Bruk tema for samtalerom"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to use the theme for chat rooms."
 msgstr "Om tema skal brukes for praterom eller ikke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Spell checking languages"
 msgstr "Stavekontrollspråk"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "Kommaseparert liste over stavekontrollspråk som skal brukes (f.eks \"no, en, "
 "fr, nl\")."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Enable spell checker"
 msgstr "Bruk stavekontroll"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Om stavekontroll skal sjekke ord mot de språkene du ønsker å bruke."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Nick completed character"
 msgstr "Tegn for fullføring av kallenavn"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -379,54 +418,54 @@ msgstr ""
 "Tegn som skal legges til etter kallenavn når fullføring av kallenavn med "
 "tabulator benyttes i gruppeprat."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr ""
 "Empathy skal bruke personbildet for kontakten som ikon for pratevinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr ""
 "Om Empathy skal bruke personbilde for kontakten som ikon for pratevinduet."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Last account selected in Join Room dialog"
 msgstr "Siste konto valgt i dialogen «Bli med i rom»"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "D-Bus objektsti for siste konto valgt for å bli med i et rom."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Camera device"
 msgstr "Kameraenhet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "Forvalgt kameraenhet til bruk for videosamtaler. F.eks. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Camera position"
 msgstr "Kameraposisjon"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Position the camera preview should be during a call."
 msgstr "Posisjon for kameraforhåndsvisning under en samtale."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Echo cancellation support"
 msgstr "Støtte for utlikning av ekko"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "Hvorvidt Pulseaudio's filter for utlikning av ekko skal slås på."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Show hint about closing the main window"
 msgstr "Vis hint om lukking av hovedvinduet"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -434,103 +473,93 @@ msgstr ""
 "Om meldingsdialog om lukking av vinduet med «x»-knappen i tittelfeltet skal "
 "vises."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Empathy can publish the user's location"
 msgstr "Empathy kan publisere brukers plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Om Empathy kan publisere brukers plassering til kontakter."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy kan bruke nettverket til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Om Empathy kan bruke nettverket for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy kan bruke mobilnettverk til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Om Empathy kan bruke mobilnettverk for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy kan bruke GPS til å gjette plassering"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Om Empathy kan bruke GPS for å gjette plassering."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy skal redusere nøyaktighet for plasseringenseri"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
 "Om Empathy skal redusere nøyaktighet for plassering av personvernhensyn."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Meldings- og VoIP-kontoer"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Håndter meldings- og VoIP-kontoer"
-
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Tilstandsendring ble etterspurt"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Du avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "Avsender avbrøt filoverføringen"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Feil under overføring av filen"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "Avsender kan ikke overføre filen"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Ukjent årsak"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Filoverføring fullført, men filen ble korrupt"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Filoverføring støttes ikke av ekstern kontakt"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Valgt fil er ikke en vanlig fil"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Valgt fil er tom"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Tapt anrop fra %s"
@@ -546,139 +575,139 @@ msgstr "Samtale med %s"
 msgid "Call from %s"
 msgstr "Samtale fra %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Borte"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Frakoblet"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen årsak oppgitt"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status er satt til frakoblet"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Nettverksfeil"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentiseringen feilet"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfeil"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Navn i bruk"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Sertifikat ikke oppgitt"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Stoler ikke på sertifikat"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikat utgått"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikat ikke aktivert"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Feil vertsnavn i forhold til sertifikat"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Fingeravtrykk stemmer ikke for sertifikat"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Selvsignert sertifikat"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Sertifikatsfeil"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering er ikke tilgjengelig"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikatet ikke ugyldig"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Tilkobling nektes"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Tilkobling kan ikke etableres"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Tilkobling mistet"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Denne ressursen er allerede koblet til tjeneren"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Denne kontoen er allerede koblet til tjeneren"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Tilkoblingen er erstattet med en ny tilkobling som bruker samme ressurs"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Tjeneren er for opptatt til å håndtere tilkoblingen"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikatet er trukket tilbake"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikatet bruker en usikker cipher-algoritme eller er kryptografisk svakt"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -686,78 +715,96 @@ msgstr ""
 "Lengden på tjenersertifikatet eller dybden på sertifikatkjeden på tjeneren "
 "oversteg grensen som settes av kryptografibiblioteket"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Programvaren din er for gammel"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Intern feil"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Personer i nærheten"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-prat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund siden"
 msgstr[1] "%d sekunder siden"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minutt siden"
 msgstr[1] "%d minutter siden"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d time siden"
 msgstr[1] "%d timer siden"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag siden"
 msgstr[1] "%d dager siden"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d uke siden"
 msgstr[1] "%d uker siden"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d måned siden"
 msgstr[1] "%d måneder siden"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i fremtiden"
 
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Passordet ble ikke funnet"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Passord for lynmeldingskonto for %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Passord for praterom «%s» på konto %s (%s)"
+
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Alle kontoer"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
@@ -775,30 +822,30 @@ msgstr "Tjener"
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Bruk"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_ogg inn"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Denne kontoen eksisterer allerede på tjeneren"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Lag en ny konto på tjeneren"
 
@@ -807,19 +854,19 @@ msgstr "Lag en ny konto på tjeneren"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s av %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:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Ny konto"
 
@@ -1273,65 +1320,65 @@ msgstr "Alle filer"
 msgid "Click to enlarge"
 msgstr "Klikk for å forstørre"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Det oppsto en feil ved start av samtalen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Valgt kontakt støtter ikke oppringing"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Valgt kontakt er koblet fra"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Valgt kontakt er ugyldig"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Nødsamtaler er ikke støttet på denne protokollen"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Du har ikke nok kreditt til å starte denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Klarte ikke å åpne privat prat"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Emne er ikke støttet for denne samtalen"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Du har ikke lov til å bytte emne"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» er ikke en gyldig kontakt-ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: tøm alle meldinger fra aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <emne>: sett emne for aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID for praterom>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <prateroms-ID>: bli med i et nytt praterom"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1339,23 +1386,23 @@ msgstr ""
 "/part [<praterom-ID>] [<årsak>]: forlat praterommet, forvalg er det aktive "
 "rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontakt-ID> [<melding>]: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontakt-ID> <melding>: åpne en privat samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <kallenavn>: bytt kallenavn på denne tjeneren"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <melding>: send en HANDLINGS-melding til aktiv samtale"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1365,11 +1412,11 @@ msgstr ""
 "sende en melding som starter med tegnet «/». For eksempel: «/say /join "
 "brukes til å bli med i et nytt praterom»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-ID>: vis informasjon om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1377,120 +1424,126 @@ msgstr ""
 "/help [<kommando>]: vis alle støttede kommandoer. Vis hjelp for <kommando> "
 "hvis den er definert."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Bruk: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Ukjent kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Ukjent kommando; se /help for tilgjengelige kommandoer"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "ikke nok kreditt til å sende melding"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Feil ved sending av melding «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Feil ved sending av melding: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "ikke nok kreditt til å sende melding. <a href='%s'>Fyll på</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ikke kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "ugyldig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "tilgang nektet"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "meldingen er for lang"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "ikke implementert"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Emne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
-msgstr "Emnet er satt til: %s"
+msgstr "Emne satt til: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Emne satt av %s til: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Emne ikke definert"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Ingen forslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Legg til «%s» i ordboken"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Legg til «%s» i ordbok for %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Sett inn smilefjes"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Send"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Staveforslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Klarte ikke å hente siste logger"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har koblet fra"
@@ -1498,12 +1551,12 @@ msgstr "%s har koblet fra"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s ble sparket av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ble sparket"
@@ -1511,17 +1564,17 @@ msgstr "%s ble sparket"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ble bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s ble bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har forlatt rommet"
@@ -1531,17 +1584,17 @@ msgstr "%s har forlatt rommet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har blitt med i rommet"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
@@ -1549,80 +1602,80 @@ msgstr "%s er nå kjent som %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Koblet fra"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Vil du lagre dette passordet?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Husk"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ikke nå"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Feil passord; vennligst prøv igjen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Dette rommet er beskyttet med et passord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Bli med"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Koblet til"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Samtale"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Ukjent eller ugyldig identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokkering av kontakter midlertidig utilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Blokkering av kontakter er ikke tilgjengelig"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Tilgang nektet"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Kunne ikke blokkere kontakt"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Rediger blokkerte kontakter"
 
@@ -1665,33 +1718,29 @@ msgstr "_Åpne lenke"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Personlig informasjon"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokker %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 "Er du sikker på at du vil blokkere «%s» fra å kontakte deg igjen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokker"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1864,7 +1913,7 @@ msgstr "Høyde:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Sted"
 
@@ -1890,6 +1939,16 @@ msgstr "Lagre personbilder"
 msgid "Unable to save avatar"
 msgstr "Kan ikke lagre personbilde"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personlige detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktdetaljer"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Fullt navn"
@@ -1972,11 +2031,6 @@ msgstr "Alias:"
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>Plassering</b> (dato)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "Kontaktdetaljer"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
@@ -1998,11 +2052,11 @@ msgstr "Versjon:"
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2010,17 +2064,17 @@ msgstr ""
 "Velg gruppene du ønsker at denne kontakten skal vises i. Du kan velge flere "
 "eller ingen."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Legg til gruppe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Velg"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Gruppe"
 
@@ -2040,156 +2094,140 @@ msgstr[1] "Følgende identiteter kan ikke blokkeres:"
 msgid "Edit Contact Information"
 msgstr "Endre kontaktinformasjon"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Koblede kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Velg kontakter som skal kobles"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Forhåndsvisning av ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakter som velges i listen til venstre vil bli koblet sammen."
-
 #. 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:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Velg en konto til bruk for samtalen"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbeid"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Hjemme"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blokker kontakt"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Prat"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
 #: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "_Tidligere samtaler"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Send fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Del mitt skrivebord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favoritt"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts er ikke installert"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Vennligst installer gnome-contacts for tilgang til kontaktdetaljer."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_masjon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_ediger"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "Koble kontakter …"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Inviterer deg til dette rommet"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Inviter til praterom"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Legg til kontakt …"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Slett og _blokker"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vil du virkelig fjerne gruppen «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 msgid "Removing group"
 msgstr "Fjerner gruppe"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
 msgid "_Remove"
 msgstr "Fje_rn"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2474
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vil du virkelig fjerne kontakten «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2198,7 +2236,7 @@ msgstr ""
 "Vil du virkelig fjerne lenket kontakt «%s»? Merk at dette vil fjerne alle "
 "kontaktene den lenkede kontakten består av."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2495
 msgid "Removing contact"
 msgstr "Fjerner kontakt"
 
@@ -2242,178 +2280,135 @@ msgstr "ny tjener"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Koble kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Fjern kobling …"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Del opp vist lenket kontakt i kontaktene den inneholder."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Koble"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Fjern kobling for lenkede kontakter «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Er du sikker på at du vil fjerne kobling for disse lenkede kontaktene? Dette "
-"vil dele de lenkede kontaktene opp i enkelte kontakter."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Fjern kobling"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historikk"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Vis"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Søk"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Prat i %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Prat med %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s sekund"
 msgstr[1] "%s sekunder"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minutt"
 msgstr[1] "%s minutter"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Samtalen tok %s, avsluttet %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "I dag"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Når som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Hvem som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Hvem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Når"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Hva som helst"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Tekstsamtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:23
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Innkommende samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Utgående samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Tapte samtaler"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Hva"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Er du sikker på at du vil slette alle logger av tidligere samtaler?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Tøm alle"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Slett fra:"
 
@@ -2499,7 +2494,7 @@ msgid "There was an error starting the conversation"
 msgstr "Det oppsto en feil ved start av samtalen"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Oppgi en kontaktidentifikator eller telefonnummer:"
 
@@ -2509,17 +2504,17 @@ msgid "New Conversation"
 msgstr "Ny samtale"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Videosamtale"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Lydsamtale"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Ny samtale"
 
@@ -2575,7 +2570,7 @@ msgstr "Egendefinerte meldinger …"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Ny %s-konto"
@@ -2644,12 +2639,12 @@ msgstr "Samtale avsluttet"
 msgid "Edit Custom Messages"
 msgstr "Rediger egendefinerte meldinger"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Melding redigert %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2727,34 +2722,38 @@ msgid "Certificate hostname: %s"
 msgstr "Vertsnavn i sertifikat: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsett"
+msgid "C_ontinue"
+msgstr "F_ortsett"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Tilkobling uten tillit"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denne tilkoblingen er ikke tiltrodd. Vil du fortsette likevel?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Husk dette valget for fremtidige tilkoblinger"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Sertifikatdetaljer"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Kan ikke åpne URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Velg en fil"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Ikke nok ledig plass til å lagre filen"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2763,7 +2762,7 @@ msgstr ""
 "%s ledig plass kreves for å lagre denne filen, men kun %s er tilgjengelig. "
 "Vennligst velg en annen lokasjon."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Innkommende fil fra %s"
@@ -2943,23 +2942,23 @@ msgstr "Ingen feilmelding"
 msgid "Instant Message (Empathy)"
 msgstr "Lynmelding (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ikke koble til ved oppstart"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ikke vis kontaktlisten eller andre dialoger ved oppstart"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Feil ved forsøk på å kontakte kontohåndtering"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3017,231 +3016,83 @@ msgstr ""
 "Espen Stefansen\n"
 "Torstein Adolf Winterseth <kvikende@fsfe.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Det oppsto en feil under import av kontoene."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Det oppsto en feil under innlesing av detaljer for kontoen."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Det oppsto en feil under oppretting av kontoen."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Det oppsto en feil."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Feilmeldingen var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Du kan enten gå tilbake og prøve å oppgi detaljer for kontoen igjen eller "
-"avslutte assistenten og legge til kontoer senere fra Rediger-menyen."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "En feil oppsto"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Hvilken type konto har du?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du noen andre lynmeldingskontoer du vil sette opp?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Oppgi detaljer for konto"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Hvilken type lynmeldingskonto vil du lage?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Vil du lage flere lynmeldingskontoer?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Oppgi detaljer for den nye kontoen"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy lar deg prate med folk på nettverk i nærheten og med venner og "
-"kolleger som bruker Google Talk, AIM, Windows Live og mange andre "
-"prateprogrammer. Hvis du har en mikrofon eller et nettkamera kan du også ha "
-"lyd- og bildesamtaler."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du en konto som du har brukt med et annet lynmeldingsprogram?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Ja, importer mine kontodetaljer fra "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jeg vil skrive inn mine kontodetaljer nå"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Nei, jeg vil ha en ny konto"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nei, jeg vil bare se personer i nærheten foreløpig"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Velg kontoer du vil importere:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Nei, det var alt for nå"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy kan oppdage og prate med andre som er koblet på samme nettverk som "
-"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
-"under er riktige. Du kan lett endre disse detaljene senere eller slå av "
-"funksjonen i «Konto»-dialogen"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Rediger->Kontoer"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Jeg vil ikke slå på de_nne funksjonen nå"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Du vil ikke kunne prate med personer som er koblet på ditt lokale nettverk "
-"siden telepathy-salut ikke er installert. Hvis du vil slå på denne "
-"funksjonen må du installere pakken telepathy-salut og opprette en «Folk i "
-"nærheten»-konto i Konto-dialogen"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut er ikke installert"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistent for meldings- og VoIP-kontoer"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Velkommen til Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importer dine eksisterende kontoer"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Vennligst oppgi personlige detaljer"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finnes ikke-lagrede endringer for din %s-konto."
 
 #. 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:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Din nye konto er ikke lagret ennå."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Kobler til …"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Frakoblet - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Koblet fra - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Frakoblet - Ingen nettverkstilkobling"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Ukjent status"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Denne kontoen har blitt deaktivert fordi den er avhengig av en gammel motor "
+"som ikke støttes. Vennligst installer telepathy-haze og start økten på nytt "
+"for å migrere kontoen."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Frakoblet - Konto deaktivert"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:574
 msgid "Edit Connection Parameters"
 msgstr "Rediger parametere for tilkobling"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:739
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Klarte ikke å hente din personlige informasjon fra tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:745
 msgid "Go online to edit your personal information."
 msgstr "Rediger din personlige informasjon på nettet."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:830
 msgid "_Edit Connection Parameters..."
 msgstr "R_ediger parametere for tilkoblingen …"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vil du fjerne %s fra din datamaskin?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Dette vil ikke fjerne din konto på tjeneren."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3250,15 +3101,23 @@ msgstr ""
 "dine endringer. Er du sikker på at du vil fortsette?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "Slå _på"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "Slå _av"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Hopp over"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Koble til"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3275,8 +3134,8 @@ msgid "_Import…"
 msgstr "_Importer …"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Laster kontoinformasjon"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3287,123 +3146,115 @@ msgstr ""
 "til en ny konto."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "Ingen protokoll installert"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "Laster kontoinformasjon"
+msgid "No protocol backends installed"
+msgstr "Ingen protokollmotor installert"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Empathy autentiseringsklient"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy autentiseringsklient"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Personer i nærheten"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy lyd-/bildeklient"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy lyd-/bildeklient"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Lysstyrke"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volum"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Sidelinje"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Lydinngang"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Videoinngang"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Nummertavle"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detaljer"
 
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Samtale med %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP-adresse som sett av maskinen"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adresse som sett av en tjener på internett"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adresse for peer som sett av andre siden"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP-adresse for en relay-tjener"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "IP-adresse for multicast-gruppe"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../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
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Koblet til - %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tekniske detaljer"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3412,8 +3263,8 @@ msgstr ""
 "Programvaren til %s forstår ikke noen av lydformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3422,8 +3273,8 @@ msgstr ""
 "Programvaren til %s forstår ikke noen av videoformatene som støttes av din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3432,29 +3283,29 @@ msgstr ""
 "Kan ikke etablere tilkobling til %s. En av dere kan være på et nettverk som "
 "ikke tillater direkte tilkoblinger."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Det oppsto en feil på nettverket"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Lydformatene som kreves for denne samtalen er ikke installert på din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Videoformatene som kreves for denne samtalen er ikke installert på din "
 "datamaskin"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3465,23 +3316,23 @@ msgstr ""
 "\">rapporter denne feilen</a> og legg ved loggene som samles inn i "
 "«Feilsøking»-vinduet i Hjelp-menyen."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Det oppsto en feil i samtalemotoren"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Slutt på strømmen ble nådd"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Kan ikke etablere lydstrøm"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Kan ikke etablere videostrøm"
 
@@ -3503,23 +3354,23 @@ msgid "_Settings"
 msgstr "Inn_stillinger"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "_Vis"
 
 #: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Help"
 msgstr "_Hjelp"
 
 #: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Contents"
 msgstr "_Innhold"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "_Feilsøk"
 
@@ -3594,8 +3445,8 @@ msgstr "Kodek for koding:"
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -3614,51 +3465,100 @@ msgstr "Ekstern kandidat:"
 msgid "Local Candidate:"
 msgstr "Lokal kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "Audio"
 msgstr "Lyd"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Lukk dette vinduet?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Hvis du lukker dette vinduet vil du forlate %s. Du vil ikke motta videre "
+"meldinger før du blir med igjen."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Hvis du lukker dette vinduet vil du forlate praterommet. Du vil ikke motta "
+"videre meldinger før du blir med igjen."
+msgstr[1] ""
+"Hvis du lukker dette vinduet vil du forlate %u praterom. Du vil ikke motta "
+"videre meldinger før du blir med igjen."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Forlat %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Du vil ikke motta videre meldinger fra dette praterommet før du blir med "
+"igjen."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Lukk vindu"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Forlat rom"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ulest)"
 msgstr[1] "%s (%d uleste)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (og %u annen)"
 msgstr[1] "%s (og %u andre)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ulest fra andre)"
 msgstr[1] "%s (%d uleste fra andre)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d ulest fra alle)"
 msgstr[1] "%s (%d uleste fra alle)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Sender %d melding"
 msgstr[1] "Sender %d meldinger"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver en melding"
 
@@ -3738,96 +3638,96 @@ msgstr "Koble til automatisk"
 msgid "Manage Favorite Rooms"
 msgstr "Håndter favorittrom"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Innkommende videosamtale"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ringer deg med video. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ringer deg. Vil du svare?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "Innkommende samtale fra %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Av_vis"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "Sv_ar"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Sv_ar med video"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Innkommende videosamtale fra %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Invitasjon til rom"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Invitasjon til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s inviterer deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Avslå"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s inviterte deg til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Du har blitt invitert til å bli med i %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Innkommende filoverføring fra %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Passord kreves"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ønsker rettigheter til å se når du er tilkoblet"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3947,86 +3847,108 @@ msgstr "Filoverføringer"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Fjerning fullført. Filoverføringer fra listen er avbrutt og feilet"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "Fant ingen kontoer å importere. Empathy støtter kun import fra Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importer kontoer"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importer"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Kilde"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Oppgi passord"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Koble fra"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du må sette opp en konto for å se kontakter her."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen treff funnet"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Beklager %s-kontoer kan ikke brukes før %s-programvaren er oppdatert."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Oppdater programvare …"
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Lukk"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Koble til på nytt"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Rediger konto"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll opp %s (%s) …"
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyll opp kreditt for konto"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyll opp …"
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Du må slå på en av kontoene for å se kontakter her."
+
+#. 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 "Du må slå på %s for å se kontakter her."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktliste"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Innstillinger for konto"
+
 #: ../src/empathy-roster-window-menubar.ui.h:2
 #: ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation…"
@@ -4066,54 +3988,50 @@ msgid "_Accounts"
 msgstr "_Kontoer"
 
 #: ../src/empathy-roster-window-menubar.ui.h:14
-msgid "_Personal Information"
-msgstr "Personlig _informasjon"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_Blokkerte kontakter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "B_rukervalg"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "Find in Contact _List"
 msgstr "Finn i kontakt_liste"
 
-#: ../src/empathy-roster-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Sorter på _navn"
 
-#: ../src/empathy-roster-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Sorter på _status"
 
-#: ../src/empathy-roster-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "Normal Size With _Avatars"
 msgstr "Normal størrelse med _avatarer"
 
-#: ../src/empathy-roster-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "N_ormal Size"
 msgstr "N_ormal størrelse"
 
-#: ../src/empathy-roster-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompakt størrelse"
 
-#: ../src/empathy-roster-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "_Rom"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Bli med …"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "Join _Favorites"
 msgstr "Bli med i _favoritter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "Manage Favorites"
 msgstr "Håndter favoritter"
 
@@ -4142,6 +4060,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nei"
 
@@ -4197,7 +4120,7 @@ msgid "New conversation"
 msgstr "Ny samtale"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakt kobler til"
 
 #: ../src/empathy-preferences.c:170
@@ -4217,46 +4140,46 @@ msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Juliet har koblet fra"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Brukervalg"
 
@@ -4273,74 +4196,82 @@ msgid "Appearance"
 msgstr "Utseende"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "_Open new chats in separate windows"
-msgstr "_Åpne nye samtaler i egne vinduer"
+msgid "Start chats in:"
+msgstr "Start prat om:"
 
 #: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "nye fa_ner"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "nye _vinduer"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Display incoming events in the notification area"
 msgstr "Vis innkommende hendelser i varslingsområdet"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "_Automatically connect on startup"
 msgstr "Koble til _automatisk ved oppstart"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
 msgid "Log conversations"
 msgstr "Logg samtaler"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:10
 msgid "Behavior"
 msgstr "Oppførsel"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "Generelt"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
 msgid "_Enable bubble notifications"
 msgstr "_Aktiver varsling med bobler"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:13
 msgid "Disable notifications when _away or busy"
 msgstr "Slå av varsling når du er borte eller oppt_att"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:14
 msgid "Enable notifications when the _chat is not focused"
 msgstr "Aktiver varsling når _prat ikke er fokusert"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
 msgid "Enable notifications when a contact comes online"
 msgstr "Slå på varsling når en kontakt kobler seg til"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:16
 msgid "Enable notifications when a contact goes offline"
 msgstr "Slå på varsling når en kontakt kobler seg fra"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "Varsling"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:18
 msgid "_Enable sound notifications"
 msgstr "_Aktiver varsling med lyder"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:19
 msgid "Disable sounds when _away or busy"
 msgstr "Slå av lyder når du er b_orte eller opptatt"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "Spill av lyd for hendelser"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "Lyder"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:22
 msgid "Use _echo cancellation to improve call quality"
 msgstr "Bruk _ekkokansellering for å forbedre kvaliteten på samtalen"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:23
 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 "
@@ -4352,11 +4283,11 @@ msgstr ""
 "den andre personen hører rare lyder eller feil under samtaler kan du prøve å "
 "slå av utlikning av ekko og starte samtalen på nytt."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Publish location to my contacts"
 msgstr "_Publiser plassering til mine kontakter"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../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 "
@@ -4366,54 +4297,54 @@ msgstr ""
 "publisert. GPS-koordinater vil ha nøyaktighet lik en desimalplass."
 
 #. 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:27
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Reduce location accuracy"
 msgstr "_Reduser nøyaktighet for plassering"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:30
 msgid "Privacy"
 msgstr "Personvern"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobiltelefon"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nettverk (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:34
 msgid "Location sources:"
 msgstr "Kilder for steder:"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Listen med språk viser bare de språkene det er installert ordliste for."
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:37
 msgid "Enable spell checking for languages:"
 msgstr "Slå på stavekontroll for språk:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:38
 msgid "Spell Checking"
 msgstr "Stavekontroll"
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:39
 msgid "Chat Th_eme:"
 msgstr "Samtale_tema:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:40
 msgid "Variant:"
 msgstr "Variant:"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:41
 msgid "Themes"
 msgstr "Temaer"
 
@@ -4477,111 +4408,130 @@ msgstr "Slå på kamera og send video"
 msgid "Contact Map View"
 msgstr "Kartvisning for kontakter"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Lagre"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Lenke til Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Svar fra Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"Data for stor for en enkel klipp-og-lim operasjon. Vennligst lagre loggene "
+"til en fil."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Feilsøkingsvindu"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Send til Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Feilsøk"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritisk"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Feil"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domene"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Valgt tilkoblingshåndterer støtter ikke utvidelse for ekstern feilsøking."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Inviter deltaker"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Velg en kontakt å invitere til samtalen:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Inviter"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ikke vis noen dialoger. Utfør arbeid (f.eks import) og avslutt"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ikke vis noen dialoger med mindre det kun finnes «Personer i nærheten»-"
 "kontoer"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Velg en gitt konto ved oppstart (f.eks. gabble/jabber/foo_40eksempel_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Vis kontoassistent"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-kontoer"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-kontoer"
 
@@ -4597,85 +4547,85 @@ msgstr "- Empathy feilsøking"
 msgid "Empathy Debugger"
 msgstr "Empathy feilsøking"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy lynmeldingsprogram"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Avvis"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Svar"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Svar med video"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Avslå"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Godta"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Oppgi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s prøvde å ringe deg, men du var i en annen samtale."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "På vent"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Demp"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Varighet"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s – %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Din saldo er %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Du har ikke nok kreditt til å starte denne samtalen."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Fyll opp"
 
@@ -4683,6 +4633,32 @@ msgstr "Fyll opp"
 msgid "_Match case"
 msgstr "Skill _mellom små/store bokstaver"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Hvilken type konto har du?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Legger til ny konto"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Personer i nærheten"
+
+#: ../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."
+msgstr ""
+"Empathy kan oppdage og prate med andre som er koblet på samme nettverk som "
+"deg automatisk. Hvis du vil bruke denne funksjonen må du sjekke om detaljene "
+"under er riktige."
+
+#: ../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 ""
+"Du kan endre disse detaljene senere eller slå av denne funksjonen ved å "
+"velge <span style=\"italic\">Rediger → Kontoer</span> i kontaktlisten."
diff --git a/po/pa.po b/po/pa.po
index be7087f8e..1837d127a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Amanpreet Singh Alam <aalam@users.sf.net>, 2009.
-# A S Alam <aalam@users.sf.net>, 2009, 2010, 2011.
+# A S Alam <aalam@users.sf.net>, 2009, 2010, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-15 13:17+0000\n"
-"PO-Revision-Date: 2011-09-18 08:55+0530\n"
+"POT-Creation-Date: 2012-02-21 15:03+0000\n"
+"PO-Revision-Date: 2012-02-23 20:57+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
@@ -24,490 +24,534 @@ msgstr ""
 "Language: pa\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "ਗੂਗਲ ਟਾਕ, ਫੇਸਬੁੱਕ, MSN ਤੇ ਹੋਰ ਕਈ ਚੈੱਟ ਸਰਵਿਸਾਂ ਉੱਤੇ ਗੱਲਾਂ ਕਰੋ"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "ਇੰਪੈਥੀ"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "IM ਕਲਾਇਟ"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "ਇੰਪੈਥੀ ਇੰਟਰਨੈੱਟ ਮੈੱਸਜ਼ਿੰਗ"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM ਕਲਾਇਟ"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "ਗੂਗਲ ਟਾਕ, ਫੇਸਬੁੱਕ, MSN ਤੇ ਹੋਰ ਕਈ ਚੈੱਟ ਸਰਵਿਸਾਂ ਉੱਤੇ ਗੱਲਾਂ ਕਰੋ"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
+msgid "Connection managers should be used"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "ਕਾਲ ਆਵਾਜ਼"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "ਕੀ ਕੁਨੈਕੁਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕੁਨੈਕਟ/ਮੁੜ-ਕੁਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "ਕਾਲ ਆਵਾਜ਼, ਫੀਸਦੀ ਵਜੋਂ।"
+msgid "Empathy should auto-connect on startup"
+msgstr "ਇੰਪੈਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਹੋਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "ਕੈਮਰਾ ਜੰਤਰ"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "ਕੈਮਰਾ ਸਥਿਤੀ"
+msgid "Empathy should auto-away when idle"
+msgstr "ਇੰਪੈਥੀ ਵੇਹਲੇ ਹੋਣ ਉੱਤੇ ਆਟੋਮੈਟਿਕ-ਦੂਰ ਕਰੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖਰ, ਜਦੋਂ ਗਰੁੱਪ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾਂ ਪੂਰਾ ਕਰਨਾ ਹੋਵੇ (ਟੈਬ)"
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ਜੇ ਯੂਜ਼ਰ ਕੁਝ ਨਾ ਕਰੇ ਤਾਂ ਕੀ ਇੰਪੈਥੀ ਆਟੋਮੈਟਿਕ ਹੀ ਦੂਰ ਸੈੱਟ ਕਰੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
+msgid "Empathy default download folder"
+msgstr "ਇੰਪੈਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ ਬਦਲ"
+msgid "The default folder to save file transfers in."
+msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿਆਂ ਨਾਲ ਅੱਡ ਕੀਤੀ ਲਿਸਟ (ਜਿਵੇਂ pa,en,)।"
+msgid "Show offline contacts"
+msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਏ ਜਾਣ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਵਰਤਿਆ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ"
+msgid "Show avatars"
+msgstr "ਅਵਤਾਰ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾਏ ਜਾਣ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "ਵਿਡੀਓ ਕਾਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਕੈਮਰਾ ਜੰਤਰ, ਜਿਵੇਂ /dev/video0"
+msgid "Show protocols"
+msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾਏ ਜਾਣ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਪੋਪਅੱਪ ਸੂਚਨਾ ਬੰਦ"
+msgid "Show Balance in contact list"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਤੁਲਨ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਸਾਊਂਡ ਆਯੋਗ"
+msgid "Whether to show account balances in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਅਕਾਊਂਟ ਬਕਾਇਆ ਵੇਖਾਉਣਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
+msgid "Compact contact list"
+msgstr "ਸੰਖੇਪ ਸੰਪਰਕ ਲਿਸਟ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਲਈ ਜਾਣਕਾਰੀ ਵੇਖਾਉ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਉਹ ਯੂਜ਼ਰ ਨੂੰ "
-"ਤੁਰੰਤ ਦਿਉ।"
+msgid "Whether to show the contact list in compact mode."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "ਈਚੋ ਰੱਦ ਕਰਨ ਸਹਿਯੋਗ"
+msgid "Hide main window"
+msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਦੇ ਸਕਦਾ ਹੈ"
+msgid "Hide the main window."
+msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤ ਸਕਦਾ ਹੈ"
+msgid "Default directory to select an avatar image from"
+msgstr "ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਨ ਵਾਸਤੇ ਡਿਫਾਲਟ ਡਾਇਰੈਕਟਰੀ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਿਆ ਗਿਆ ਸੀ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
+msgid "Open new chats in separate windows"
+msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "ਇੰਪੈਥੀ ਡਿਫਾਲਟ ਡਾਊਨਲੋਡ ਫੋਲਡਰ"
+msgid "Always open a separate chat window for new chats."
+msgstr "ਨਵੀਆਂ ਗੱਲਾਂ ਲਈ ਹਮੇਸ਼ਾ ਇੱਕ ਵੱਖਰੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਰਤੋਂ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ"
+msgid "Display incoming events in the status area"
+msgstr "ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "ਇੰਪੈਥੀ ਵੇਹਲੇ ਹੋਣ ਉੱਤੇ ਆਟੋਮੈਟਿਕ-ਦੂਰ ਕਰੇ"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"ਹਾਲਤ ਖੇਤਰ 'ਚ ਆ ਰਹੇ ਈਵੈਂਟ ਲਈ ਜਾਣਕਾਰੀ ਵੇਖਾਉ। ਜੇ ਸੈੱਟ ਨਾ ਕੀਤਾ ਤਾਂ ਉਹ ਯੂਜ਼ਰ ਨੂੰ "
+"ਤੁਰੰਤ ਦਿਉ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "ਇੰਪੈਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਕੁਨੈਕਟ ਹੋਵੇ"
+msgid "The position for the chat window side pane"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸੰਭਾਲੀ ਸਥਿਤੀ (ਪਿਕਸਲ 'ਚ)।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "ਸੰਪਰਕ ਗਰੁੱਪ ਵੇਖਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "ਵੈਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ ਚਾਲੂ"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਗਰੁੱਪ ਵੇਖਾਉਣੇ ਹਨ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਪੋਪਅੱਪ ਸੂਚਨਾ ਚਾਲੂ"
+msgid "Contact list sort criterion"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਢੰਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
+#| 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 ""
+"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ "
+"ਡਿਫਾਲਟ ਹਾਲਤ "
+"ਦੇ ਨਾਂ ਨਾਲ \"state (ਹਾਲਤ)\" ਹੈ। \"name (ਨਾਂ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ "
+"ਲੜੀਬੱਧ ਕਰੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ"
+msgid "Use notification sounds"
+msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਓਹਲੇ ਕਰੋ"
+msgid "Whether to play a sound to notify of events."
+msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
+msgid "Disable sounds when away"
+msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਸਾਊਂਡ ਆਯੋਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "ਵਰਤਣ ਵਾਸਤੇ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
+msgid "Play a sound for incoming messages"
+msgstr "ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧੁਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚੁਣਿਆ ਹੋਵੇ।"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ਕੀ ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਇੱਕ ਧੁਨੀ ਚਲਾਓ"
+msgid "Play a sound for outgoing messages"
+msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧੁਨੀ ਚਲਾਓ"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਆਵਾਜ਼ ਚਲਾਓ"
+msgid "Play a sound for new conversations"
+msgstr "ਨਵੀਆਂ ਗੱਲਾਂਬਾਤਾਂ ਲਈ ਧੁਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
+msgid "Play a sound when a contact logs in"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗਇਨ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀਏ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
+msgid "Play a sound when a contact logs out"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਲਾਗ-ਆਉਟ ਕਰੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
+msgid "Play a sound when we log in"
+msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗਇਨ ਕਰੀਏ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
+msgid "Whether to play a sound when logging into a network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "ਕਾਲ ਦੇ ਦੌਰਾਨ ਝਲਕ ਵੇਖਾਉਣ ਲਈ ਕੈਮਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
+msgid "Play a sound when we log out"
+msgstr "ਜਦੋਂ ਅਸੀਂ ਲਾਗ-ਆਉਟ ਕਰਨਾ ਹੋਵੇ ਤਾਂ ਧੁਨੀ ਚਲਾਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਤੁਲਨ ਵੇਖੋ"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "ਅਵਤਾਰ ਵੇਖੋ"
+msgid "Enable popup notifications for new messages"
+msgstr "ਨਵੇਂ ਸੁਨੇਹਿਆਂ ਲਈ ਪੋਪਅੱਪ ਸੂਚਨਾ ਚਾਲੂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
+msgid "Disable popup notifications when away"
+msgstr "ਦੂਰ ਹੋਵੋ ਤਾਂ ਪੋਪਅੱਪ ਸੂਚਨਾ ਬੰਦ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ ਵੇਖੋ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰੁੱਝੇ ਹੋਵੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "ਜੇ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ "
+"ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ "
+"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਸੰਭਾਲਣ ਲਈ ਡਿਫਾਲਟ ਫੋਲਡਰ ਹੈ।"
+msgid "Pop up notifications when a contact logs in"
+msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਇਨ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "ਆਖਰੀ ਡਾਇਰੈਕਟਰੀ, ਜਿੱਥੇ ਅਵਤਾਰ ਚਿੱਤਰ ਚੁਣਿਆ ਗਿਆ ਸੀ।"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸਥਿਤੀ"
+msgid "Pop up notifications when a contact logs out"
+msgstr "ਜੇ ਸੰਪਰਕ ਲਾਗ ਆਉਟ ਕਰੇ ਤਾਂ ਸੂਚਨਾ ਪੋਪਅੱਪ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਬਾਹੀ ਦੀ ਸੰਭਾਲੀ ਸਥਿਤੀ (ਪਿਕਸਲ 'ਚ)।"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
+msgid "Use graphical smileys"
+msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "ਥੀਮ ਬਦਲ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "ਗਰਾਫਿਕਸ ਚਿਹਰੇ ਵਰਤੋਂ"
+msgid "Show contact list in rooms"
+msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵਰਤੋਂ"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
+msgid "Chat window theme"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "ਥੀਮ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
+msgid "Chat window theme variant"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਥੀਮ ਬਦਲ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "ਥੀਮ ਬਦਲ, ਜੋ ਕਿ ਗੱਲਬਾਤ ਵਿੰਡੋ ਵਿੱਚ ਗੱਲਾਂ ਵੇਖਾਉਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
+msgid "Path of the Adium theme to use"
+msgstr "ਵਰਤਣ ਵਾਸਤੇ ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚੁੱਕਿਆ ਹੈ।"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "ਅਡੀਓਮ ਥੀਮ ਲਈ ਪਾਥ, ਜੋ ਕਿ ਵਰਤਣਾ ਹੈ, ਜਦੋਂ ਗੱਲਬਾਤ ਲਈ ਅਡੀਓਮ ਥੀਮ ਚੁਣਿਆ ਹੋਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਤੁਹਾਡੇ ਅਕਾਊਂਟਾਂ ਵਿੱਚ ਲਾਗ ਇਨ ਕਰੇ।"
+msgid "Enable WebKit Developer Tools"
+msgstr "ਵੈਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ ਚਾਲੂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "ਜੇ ਯੂਜ਼ਰ ਕੁਝ ਨਾ ਕਰੇ ਤਾਂ ਕੀ ਇੰਪੈਥੀ ਆਟੋਮੈਟਿਕ ਹੀ ਦੂਰ ਸੈੱਟ ਕਰੇ।"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ।"
+msgid "Inform other users when you are typing to them"
+msgstr "ਹੋਰ ਯੂਜ਼ਰ ਨੂੰ ਜਾਣਕਾਰੀ ਦਿਉ ਕਿ ਤੁਸੀਂ ਉਹਨਾਂ ਲਈ ਲਿਖ ਰਹੇ ਹੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "ਕੀ ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ।"
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "ਕੀ ਵੈੱਬਕਿੱਟ ਡਿਵੈਲਪਰ ਟੂਲ, ਜਿਵੇਂ ਕਿ ਵੈੱਬ ਇੰਸਪੈਕਟਰ ਆਦਿ ਯੋਗ ਕਰਨੇ ਹਨ।"
+msgid "Use theme for chat rooms"
+msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤੋਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "ਕੀ ਕੁਨੈਕੁਵਿਟੀ ਮੈਨੇਜਰ ਆਟੋਮੈਟਿਕ ਡਿਸ-ਕੁਨੈਕਟ/ਮੁੜ-ਕੁਨਕੈਟ ਲਈ ਵਰਤਿਆ ਜਾਵੇ"
+msgid "Whether to use the theme for chat rooms."
+msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "ਕੀ ਜਦੋਂ ਤੁਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
+msgid "Spell checking languages"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਭਾਸ਼ਾਵਾਂ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "ਕੀ ਸਮਾਈਲੀ ਨੂੰ ਗੱਲਬਾਤ ਵਿੱਚ ਗਰਾਫਿਕਲ ਚਿੱਤਰਾਂ ਵਿੱਚ ਬਦਲਿਆ ਜਾਵੇ"
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "ਸਪੈਲ ਚੈਕਰ ਭਾਸ਼ਾਵਾਂ ਦੀ ਕਾਮਿਆਂ ਨਾਲ ਅੱਡ ਕੀਤੀ ਲਿਸਟ (ਜਿਵੇਂ pa,en,)।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "ਕੀ ਪਲੱਸਆਡੀਓ ਦਾ ਈਚੋ ਰੱਦ ਕਰਨ ਫਿਲਟਰ ਚਾਲੂ ਕਰਨਾ ਹੈ"
+msgid "Enable spell checker"
+msgstr "ਸ਼ਬਦ-ਜੋੜ ਯੋਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਇਨ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "ਕੀ ਜਦੋਂ ਤੁਸੀਂ ਲਿਖੋ ਤਾਂ ਸ਼ਬਦਾਂ ਨੂੰ ਭਾਸ਼ਾ ਲਈ ਚੈੱਕ ਕੀਤਾ ਜਾਵੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਸੰਪਰਕ ਦੇ ਲਾਗ ਆਫ਼ ਕਰਨ ਸਮੇਂ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid "Nick completed character"
+msgstr "ਨਾਂ ਪੂਰਾ ਅੱਖਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "ਕੀ ਈਵੈਂਟਾਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"ਨਾਂ ਦੇ ਬਾਅਦ ਵਿੱਚ ਜੋੜਨ ਲਈ ਅੱਖਰ, ਜਦੋਂ ਗਰੁੱਪ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾਂ ਪੂਰਾ ਕਰਨਾ ਹੋਵੇ (ਟੈਬ)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ਕੀ ਆ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "ਕੀ ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਦੀ ਸੂਚਨਾ ਲਈ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਗੱਲਬਾਤ ਵਿੰਡੋ ਆਈਕਾਨ ਵਜੋਂ ਸੰਪਰਕ ਦੇ ਅਵਤਾਰ ਨੂੰ ਵਰਤੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ਕੀ ਬਾਹਰ ਜਾ ਰਹੇ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਵਾਸਤੇ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid "Last account selected in Join Room dialog"
+msgstr "ਰੂਮ ਜੁਆਇੰਨ ਡਾਈਲਗ ਲਈ ਆਖਰੀ ਵਾਰ ਚੁਣਿਆ ਅਕਾਊਂਟ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਉੱਤੇ ਲਾਗ ਇਨ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ।"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ਕੀ ਨੈੱਟਵਰਕ ਤੋਂ ਲਾਗ ਆਫ਼ ਕਰਨ ਦੌਰਾਨ ਸਾਊਂਡ ਚਲਾਈ ਜਾਵੇ"
+msgid "Camera device"
+msgstr "ਕੈਮਰਾ ਜੰਤਰ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝੇ ਹੋਵੇ ਤਾਂ ਕੀ ਸਾਊਂਡ ਸੂਚਨਾਵਾਂ ਚਲਾਉਣੀਆਂ ਹਨ।"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "ਵਿਡੀਓ ਕਾਲ ਵਿੱਚ ਵਰਤਣ ਲਈ ਡਿਫਾਲਟ ਕੈਮਰਾ ਜੰਤਰ, ਜਿਵੇਂ /dev/video0"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੋਵੇ।"
+msgid "Camera position"
+msgstr "ਕੈਮਰਾ ਸਥਿਤੀ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਵੇ।"
+msgid "Position the camera preview should be during a call."
+msgstr "ਕਾਲ ਦੇ ਦੌਰਾਨ ਝਲਕ ਵੇਖਾਉਣ ਲਈ ਕੈਮਰੇ ਦੀ ਸਥਿਤੀ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਇੱਕ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ, ਭਾਵੇਂ ਗੱਲਬਾਤ "
-"ਪਹਿਲਾਂ ਖੁੱਲ੍ਹੀ ਹੋਵੇ, ਪਰ "
-"ਫੋਕਸ ਨਾ ਹੋਵੇ।"
+msgid "Echo cancellation support"
+msgstr "ਈਚੋ ਰੱਦ ਕਰਨ ਸਹਿਯੋਗ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਇਆ ਜਾਵੇ, ਜਦੋਂ ਨਵਾਂ ਸੁਨੇਹਾ ਮਿਲੇ।"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "ਕੀ ਪਲੱਸਆਡੀਓ ਦਾ ਈਚੋ ਰੱਦ ਕਰਨ ਫਿਲਟਰ ਚਾਲੂ ਕਰਨਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਅਕਾਊਂਟ ਬਕਾਇਆ ਵੇਖਾਉਣਾ ਹੈ।"
+msgid "Show hint about closing the main window"
+msgstr "ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਦੌਰਾਨ ਸੰਕੇਤ ਵੇਖੋ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਅਤੇ ਗੱਲਬਾਤ ਵਿੰਡੋਜ਼ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਅਵਤਾਰ ਵੇਖਾਏ ਜਾਣ।"
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸੁਨੇਹਾ ਡਾਈਲਾਗ "
+"ਵੇਖਾਇਆ ਜਾਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "ਕੀ ਸੰਪਰਕ, ਜੋ ਕਿ ਆਫਲਾਈਨ ਹਨ, ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਵੇਖਾਏ ਜਾਣ"
+msgid "Empathy can publish the user's location"
+msgstr "ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦਾ ਟਿਕਾਣਾ ਦੇ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ਕੀ ਪੋਪਅੱਪ ਨੋਟੀਫਿਕੇਸ਼ਨ ਵੇਖਾਏ ਜਾਣ, ਜਦੋਂ ਦੂਰ ਰੁੱਝੇ ਹੋਵੋ"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਯੂਜ਼ਰ ਦੇ ਟਿਕਾਣਿਆਂ ਬਾਰੇ ਜਾਣਕਾਰੀ ਉਸ ਦੇ ਸੰਪਰਕਾਂ ਨਾਲ ਦੇਵੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਵਿੱਚ ਸੰਪਰਕਾਂ ਲਈ ਪਰੋਟੋਕਾਲ ਵੇਖਾਏ ਜਾਣ।"
+msgid "Empathy can use the network to guess the location"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "ਕੀ ਗਲੱਬਾਤ ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖਣੀ ਹੈ।"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਾਉਣ ਲਈ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "ਕੀ ਸੰਪਰਕ ਲਿਸਟ ਨੂੰ ਸੰਖੇਪ ਮੋਡ ਵਿੱਚ ਵੇਖਣਾ ਹੈ।"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"ਕੀ ਟਾਈਟਲ ਬਾਰ ਵਿੱਚ 'x' ਬਟਨ ਦਬਾਉਣ ਨਾਲ ਮੁੱਖ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਬਾਰੇ ਸੁਨੇਹਾ ਡਾਈਲਾਗ "
-"ਵੇਖਾਇਆ ਜਾਵੇ।"
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ ਸੈਲੂਲਰ ਨੈੱਟਵਰਕ ਵਰਤੇ।"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "ਕੀ ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਥੀਮ ਵਰਤਣਾ ਹੈ।"
+msgid "Empathy can use the GPS to guess the location"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤ ਸਕਦਾ ਹੈ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦਾ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੇ।"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "ਇੰਪੈਥੀ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
-msgstr ""
-"ਜਦੋਂ ਸੰਪਰਕ ਲਿਸਟ ਲੜੀਬੱਧ ਕਰਨੀ ਹੋਵੇ ਤਾਂ ਕਿਹੜਾ ਮਾਪ-ਢੰਡ ਵਰਤਣਾ ਹੈ। ਲੜੀਬੱਧ ਕਰਨ ਲਈ "
-"ਡਿਫਾਲਟ ਸੰਪਰਕ "
-"ਦੇ ਨਾਂ ਨਾਲ \"name (ਨਾਂ)\" ਹੈ। \"state (ਹਾਲਤ)\" ਨੂੰ ਸੰਪਰਕ ਦੀ ਹਾਲਤ ਮੁਤਾਬਕ "
-"ਲੜੀਬੱਧ ਕਰੋ"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "ਕੀ ਇੰਪੈਥੀ ਪਰਾਈਵੇਸੀ ਕਾਰਨਾਂ ਕਰਕੇ ਟਿਕਾਣੇ ਦੀ ਸ਼ੁੱਧਤਾ ਘਟਾਵੇ।"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਪਰਬੰਧ"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "ਤੁਸੀਂ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ੍ਹ ਹੈ"
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "ਅਣਜਾਣ ਕਾਰਨ"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੂਰਾ ਹੋਇਆ, ਪਰ ਫਾਇਲ ਖ਼ਰਾਬ ਸੀ"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "ਰਿਮੋਟ ਸੰਪਰਕ ਵਲੋਂ ਫਾਇਲ ਟਰਾਂਸਫਰ ਸਹਾਇਕ ਨਹੀਂ"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "ਚੁਣੀ ਫਾਇਲ ਨਿਯਮਤ ਫਾਇਲ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "ਚੁਣੀ ਫਾਇਲ ਖਾਲੀ ਹੈ"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s ਤੋਂ ਮਿਸ ਹੋਈ ਕਾਲ "
@@ -523,169 +567,139 @@ msgstr "%s ਨੂੰ ਕਾਲ ਕੀਤੀ"
 msgid "Call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆਈ"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "ਹਾਲਤ ਬਦਲਣ ਲਈ ਮੰਗ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "ਤੁਸੀਂ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਨੇ ਫਾਇਲ ਸੰਚਾਰ ਰੱਦ ਕੀਤਾ"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "ਫਾਇਲ ਸੰਚਾਰ ਦੀ ਕੋਸ਼ਿਸ਼ ਦੌਰਾਨ ਗਲਤੀ"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "ਹੋਰ ਯੋਗਦਾਨੀ ਫਾਇਲ ਸੰਚਾਰ ਲਈ ਫੇਲ੍ਹ ਹੈ"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "ਅਣਜਾਣ ਕਾਰਨ"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "ਉਪਲੱਬਧ"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ਰੁਝੇ"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "ਦੂਰ"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "ਅਦਿੱਖ"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "ਹਾਲਤ ਆਫਲਾਈਨ ਸੈੱਟ ਕੀਤਾ"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "ਨੈੱਟਵਰਕ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "ਪਰਮਾਣਕਿਤਾ ਫੇਲ੍ਹ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "ਵਰਤਣ ਲਈ ਨਾਂ"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਬੇਭਰੋਸੇਯੋਗ"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗੀ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਸਰਗਰਮ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ ਨਹੀਂ ਮਿਲਦਾ"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਫਿੰਗਰ-ਪਰਿੰਟ ਮਿਲਦਾ ਨਹੀਂ"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਖੁਦ-ਦਸਤਖਤੀ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤੀ"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਗਲਤ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋ ਗਿਆ"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "ਇਹ ਸਰੋਤ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੈ"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਪਹਿਲਾਂ ਹੀ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ਉਸੇ ਸਰੋਤ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੁਨੈਕਸ਼ਨ ਨੂੰ ਨਵੇਂ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਬਦਲ ਦਿੱਤਾ ਗਿਆ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "ਸਰਵਰ ਇਸ ਵੇਲੇ ਐਨਾ ਰੁੱਝਿਆ ਹੋਇਆ ਹੈ ਕਿ ਕੁਨੈਕਸ਼ਨ ਸੰਭਾਲ ਨਹੀਂ ਸਕਦਾ"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਮਨਸੂਖ ਕੀਤਾ ਜਾ ਚੁੱਕਾ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "ਸਰਟੀਫਿਕੇਟ ਅਸੁਰੱਖਿਅਤ ਸੀਫ਼ਰ ਐਲਗੋਰਿਥਮ ਵਰਤਦਾ ਹੈ ਜਾਂ ਕਮਜ਼ੋਰ ਕ੍ਰਿਪਟੋਗਰਾਫਿਕਲ ਵਰਤਦਾ ਹੈ"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -694,283 +708,263 @@ msgstr ""
 "ਲਾਇਬਰੇਰੀ ਵਲੋਂ ਰੱਖੀ "
 "ਗਈ ਲਿਮਟ ਤੋਂ ਵੱਧ ਗਈ ਹੈ।"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "ਤੁਹਾਡਾ ਸਾਫਟਵੇਅਰ ਬਹੁਤ ਪੁਰਾਣਾ ਹੈ"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "ਨੇੜਲੇ ਲੋਕ"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "ਯਾਹੂ! ਜਾਪਾਨ"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "ਗੂਗਲ ਟਾਕ"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "ਫੇਸਬੁੱਕ ਚੈਟ"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਸਕਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਿੰਟ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d ਘੰਟਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਘੰਟੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d ਦਿਨ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਦਿਨ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d ਹਫ਼ਤਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਹਫ਼ਤੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ਮਹੀਨਾ ਪਹਿਲਾਂ"
 msgstr[1] "%d ਮਹੀਨੇ ਪਹਿਲਾਂ"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "ਭਵਿੱਖ ਵਿੱਚ"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "ਸਭ ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "ਪਾਸਵਰਡ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "ਸਰਵਰ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ਪੋਰਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "ਅਕਾਊਂਟ %s ਨੂੰ %s ਰਾਹੀਂ ਸੋਧਿਆ ਗਿਆ ਹੈ।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "ਅਕਾਊਂਟ %s ਇੰਪੈਥੀ 'ਚ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਚਲਾਉ"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "%s ਬਦਲੋ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "ਲਾਗੂ ਕਰੋ(_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "ਲਾਗਇਨ(_o)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "ਰੱਦ ਕਰੋ(_n)"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ਉੱਤੇ %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ਅਕਾਊਂਟ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "ਨਵਾਂ ਅਕਾਊਂਟ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>ਜਿਵੇਂ:</b> MyScreenName"
+#: ../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:"
+msgstr "ਪਾਸਵਰਡ(_w):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "ਤਕਨੀਕੀ"
+msgid "Screen _Name:"
+msgstr "ਸਕਰੀਨ ਨਾਂ(_N):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>ਜਿਵੇਂ:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "ਪਾਸਵਰਡ(_w):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ਪੋਰਟ(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "ਸਕਰੀਨ ਨਾਂ(_N):"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "ਸਰਵਰ(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "ਤੁਹਾਡਾ AIM ਪਾਸਵਰਡ ਕੀ ਹੈ?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "ਤੁਹਾਡਾ AIM ਸਕਰੀਨ ਨਾਂ ਕੀ ਹੈ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ਪੋਰਟ(_P):"
+msgid "What is your AIM password?"
+msgstr "ਤੁਹਾਡਾ AIM ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "ਸਰਵਰ(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>ਜਿਵੇਂ ਕਿ:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "ਪਾਸਵਰਡ ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "ਲਾਗਇਨ I_D:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>ਜਿਵੇਂ ਕਿ:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "ਤੁਹਾਡਾ ਗਰੁੱਪਵਾਈਜ਼ ਯੂਜ਼ਰ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "ਤੁਹਾਡਾ ਗਰੁੱਪਵਾਈਜ਼ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>ਜਿਵੇਂ:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ਅੱਖਰ ਸੈੱਟ(_a):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ਤੁਹਾਡਾ ICQ UIN ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ਤੁਹਾਡਾ ICQ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
@@ -1007,11 +1001,23 @@ msgstr "ਚੋਣਾਂ"
 msgid "None"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "ਨੈੱਟਵਰਕ"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "ਨੈੱਟਵਰਕ:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "ਅੱਖਰ ਸੈੱਟ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "ਸਰਵਰ"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1020,14 +1026,6 @@ msgstr ""
 "ਹੋਵੇ ਤਾਂ ਪਾਸਵਰਡ "
 "ਨਾ ਦਿਉ।"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "ਨੈੱਟਵਰਕ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "ਨੈੱਟਵਰਕ:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "ਨਾਂ:"
@@ -1044,48 +1042,20 @@ msgstr "ਬੰਦ ਕਰਨ ਸੁਨੇਹਾ:"
 msgid "Real name:"
 msgstr "ਅਸਲੀ ਨਾਂ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "ਸਰਵਰ"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "ਤੁਹਾਡਾ IRC ਨਾਂ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "ਕਿਹੜਾ IRC ਨੈੱਟਵਰਕ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>ਜਿਵੇਂ:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>ਜਿਵੇਂ:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਚਾਹੀਦੀ ਹੈ (TLS/SSL)(_y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ(_g)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠੀ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "ਤਰਜੀਹ(_t):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "ਤੁਹਾਡਾ IRC ਨਾਂ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "ਸਰੋਤ(_u):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1098,209 +1068,233 @@ msgstr ""
 "href=\"http://www.facebook.com/"
 "username/\">ਇਹ ਪੇਜ਼</a> ਵਰਤੋਂ।"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "ਪੁਰਾਣੀ SS_L ਵਰਤੋਂ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "ਤੁਹਾਡਾ ਫੇਸਬੁੱਕ ਯੂਜ਼ਰ ਨਾਂ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "ਤੁਹਾਡਾ ਗੂਗਲ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>ਜਿਵੇਂ:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "ਤੁਹਾਡਾ ਗੂਗਲ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>ਜਿਵੇਂ:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "SSL ਸਰਟੀਫਿਕੇਟ ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ(_g)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "ਤਰਜੀਹ(_t):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "ਸਰੋਤ(_u):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ਇੰਕ੍ਰਿਪਸ਼ਨ ਚਾਹੀਦੀ ਹੈ (TLS/SSL)(_y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "ਪੁਰਾਣੀ SS_L ਵਰਤੋਂ"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "ਸਰਵਰ ਸੈਟਿੰਗ ਅਣਡਿੱਠੀ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "ਤੁਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "ਤੁਹਾਡਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "ਤੁਹਾਡਾ ਚਾਹੀਦਾ ਜੱਬਰ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>ਜਿਵੇਂ:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "ਤੁਹਾਡਾ ਵਿੰਡੋਜ਼ ਲਾਈਵ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ਈਮੇਲ ਐਡਰੈੱਸ(_m):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "ਨਾਂ(_k):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "ਆਖਰੀ ਨਾਂ(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "ਪਹਿਲਾਂ ਨਾਂ(_F): "
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "ਪਰਕਾਸ਼ਿਤ ਕੀਤਾ ਨਾਂ(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ਜੱਬਰ ID(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "ਆਖਰੀ ਨਾਂ(_L):"
+msgid "E-_mail address:"
+msgstr "ਈਮੇਲ ਐਡਰੈੱਸ(_m):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "ਪਰਕਾਸ਼ਿਤ ਕੀਤਾ ਨਾਂ(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>ਜਿਵੇਂ:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "ਪਰਮਾਣਕਿਤ ਯੂਜ਼ਰਨਾਂ:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "ਬਾਈਡਿੰਗ ਖੋਜ"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN ਸਰਵਰ ਆਟੋਮੈਟਿਕ ਹੀ ਲੱਭੋ"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "ਇਹ ਅਕਾਊਂਟ ਨੂੰ ਲੈਂਡਲਾਈਨ ਅਤੇ ਮੋਬਾਇਲ ਫੋਨ ਉੱਤੇ ਕਾਲ ਕਰਨ ਲਈ ਵਰਤੋਂ(_l)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ ਕਰੋ"
+msgid "NAT Traversal Options"
+msgstr "NAT ਟਰਾਂਸਵਰਸਲ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "ਅੰਤਰਾਲ (ਸਕਿੰਟ)"
+msgid "Proxy Options"
+msgstr "ਪਰਾਕਸੀ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "ਜਾਰੀ ਰੱਖਣ ਚੋਣਾਂ"
+msgid "Miscellaneous Options"
+msgstr "ਫੁਟਕਲ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ਹਲਕਾ ਰੂਟਿੰਗ"
+msgid "STUN Server:"
+msgstr "STUN ਸਰਵਰ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "ਫੰਘ:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN ਸਰਵਰ ਆਟੋਮੈਟਿਕ ਹੀ ਲੱਭੋ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "ਫੁਟਕਲ ਚੋਣਾਂ"
+msgid "Discover Binding"
+msgstr "ਬਾਈਡਿੰਗ ਖੋਜ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT ਟਰਾਂਸਵਰਸਲ ਚੋਣਾਂ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "ਸਰਵਰ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "ਜਾਰੀ ਰੱਖਣ ਚੋਣਾਂ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "ਪੋਰਟ:"
+msgid "Mechanism:"
+msgstr "ਫੰਘ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "ਪਰਾਕਸੀ ਚੋਣਾਂ"
+msgid "Interval (seconds)"
+msgstr "ਅੰਤਰਾਲ (ਸਕਿੰਟ)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "ਪਰਮਾਣਕਿਤ ਯੂਜ਼ਰਨਾਂ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "ਟਰਾਂਸਪੋਰਟ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN ਸਰਵਰ:"
+msgid "Loose Routing"
+msgstr "ਹਲਕਾ ਰੂਟਿੰਗ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "ਸਰਵਰ:"
+msgid "Ignore TLS Errors"
+msgstr "TLS ਗਲਤੀਆਂ ਅਣਡਿੱਠੀਆਂ ਕਰੋ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "ਟਰਾਂਸਪੋਰਟ:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "ਇਹ ਅਕਾਊਂਟ ਨੂੰ ਲੈਂਡਲਾਈਨ ਅਤੇ ਮੋਬਾਇਲ ਫੋਨ ਉੱਤੇ ਕਾਲ ਕਰਨ ਲਈ ਵਰਤੋਂ(_l)"
+msgid "Port:"
+msgstr "ਪੋਰਟ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "ਤੁਹਾਡਾ SIP ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ਤੁਹਾਡਾ SIP ਲਾਗਇਨ ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "ਯੂਜ਼ਰ ਨਾਂ(_U):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "ਤੁਹਾਡਾ SIP ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "ਯਾਹੂ! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "ਕਨਫਰੰਸ ਅਤੇ ਗੱਲਬਾਤ ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ(_g)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ਤੁਹਾਡਾ ਯਾਹੂ! ID ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ਤੁਹਾਡਾ ਯਾਹੂ! ਪਾਸਵਰਡ ਕੀ ਹੈ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "ਯਾਹੂ! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ਰੂਮ ਲਿਸਟ ਭਾਸ਼ਾ(_R):"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "ਚਿੱਤਰ ਨਾ ਬਦਲੋ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ਕੋਈ ਵੀ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਚਿੱਤਰ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਸਿਸਟਮ ਵਲੋਂ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "ਤਸਵੀਰ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "ਆਪਣਾ ਅਵਤਾਰ ਲੇਖ ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "ਤਸਵੀਰ ਲਵੋ..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "ਕੋਈ ਚਿੱਤਰ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "ਚਿੱਤਰ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "ਸਭ ਫਾਇਲਾਂ"
 
@@ -1308,84 +1302,88 @@ msgstr "ਸਭ ਫਾਇਲਾਂ"
 msgid "Click to enlarge"
 msgstr "ਵੱਡਾ ਕਰਨ ਲਈ ਕਲਿੱਕ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "ਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਕਾਲ ਕਰਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਸਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "ਇਹ ਪਰੋਟੋਕਾਲ ਉੱਤੇ ਐਮਰਜੈਂਸੀ ਕਾਲ ਸਹਾਇਕ ਨਹੀਂ ਹਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "ਇਹ ਗੱਲਬਾਤ ਲਈ ਵਿਸ਼ਾ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "ਤੁਹਾਨੂੰ ਵਿਸ਼ਾ ਬਦਲਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” ਇੱਕ ਠੀਕ ਸੰਪਰਕ ID ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਤੋਂ ਸਭ ਸੁਨੇਹੇ ਸਾਫ਼ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਦਾ ਵਿਸ਼ਾ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ਨਵਾਂ ਗੱਲਬਾਤ ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<chat room ID>] [<reason>]: ਚੈਟ ਰੂਮ ਛੱਡੋ, ਡਿਫਾਲਟ ਰੂਪ ਵਿੱਚ ਮੌਜੂਦਾ ਇੱਕ ਹੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਖੋਲ੍ਹੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ਪ੍ਰਾਈਵੇਟ ਗੱਲਬਾਤ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ਮੌਜੂਦਾ ਸਰਵਰ ਉੱਤੇ ਆਪਣਾ ਨਾਂ ਬਦਲੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>:ਇੱਕ ਐਕਸ਼ਨ ਸੁਨੇਹਾ ਮੌਜੂਦਾ ਗੱਲਬਾਤ ਵਿੱਚ ਭੇਜੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1395,11 +1393,11 @@ msgstr ""
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: display information about a contact"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1407,113 +1405,128 @@ msgstr ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "ਵਰਤੋਂ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "ਅਣਜਾਣ ਕਮਾਂਡ; ਉਪਲੱਬਧ ਕਮਾਂਡ ਵਾਸਤੇ ਮੱਦਦ ਲਈ /help ਵਰਤੋਂ"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਲੋੜੀਦਾ ਬਕਾਇਆ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਲੋੜੀਦਾ ਬਕਾਇਆ ਨਹੀਂ ਹੈ। <a href='%s'>ਟਾਪ ਅੱਪ</a>।"
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "ਸਮਰੱਥਾ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "ਆਫਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ਗਲਤ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "ਬਹੁਤ ਲੰਮਾ ਸੁਨੇਹਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "ਸਥਾਪਤ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "ਸੁਨੇਹਾ '%s' ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "ਵਿਸ਼ਾ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ਵਿਸ਼ਾ ਨਹੀਂ ਕੀਤਾ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "ਵਿਸ਼ਾ %s ਵਲੋਂ ਸੈੱਟ ਕੀਤਾ: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "ਕੋਈ ਵਿਸ਼ਾ ਨਹੀਂ ਦਿੱਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s' ਨੂੰ ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' ਨੂੰ %s ਡਿਕਸ਼ਨਰੀ 'ਚ ਜੋੜੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "ਚਿਹਰਾ ਸ਼ਾਮਲ ਕਰੋ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "ਭੇਜੋ(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "ਸਪੈਲਿੰਗ ਸੁਝਾਅ(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "ਤਾਜ਼ਾ ਲਾਗ ਲੈਣ ਲਈ ਫੇਲ੍ਹ"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
@@ -1521,12 +1534,12 @@ msgstr "%s ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ਨੇ %1$s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
@@ -1534,17 +1547,17 @@ msgstr "%s ਨੂੰ ਕਿੱਕ ਮਾਰੀ"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ਵਲੋਂ %1$s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਈ"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
@@ -1554,17 +1567,17 @@ msgstr "%s ਨੇ ਰੂਮ ਛੱਡਿਆ"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਹੋਇਆ"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ਨੂੰ ਹੁਣ %s ਵਜੋਂ ਜਾਣਿਆ ਜਾਵੇਗਾ"
@@ -1572,90 +1585,89 @@ msgstr "%s ਨੂੰ ਹੁਣ %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:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2588
 msgid "Disconnected"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਪਾਸਵਰਡ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ਹੁਣ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "ਮੁੜ-ਕੋਸ਼ਿਸ਼"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ਗਲਤ ਪਾਸਵਰਡ; ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "ਇਹ ਰੂਮ ਪਾਸਵਰਡ ਨਾਲ ਸੁਰੱਖਿਅਤ ਹੈ:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "ਦਾਖਲ"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "ਗੱਲਬਾਤ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "ਅਣਜਾਣ ਜਾਂ ਗਲਤ ਪਛਾਣ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "ਸੰਪਰਕ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "ਸੰਪਰਕ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਉਪਲੱਬਧ ਨਹੀਂ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਜਾ ਸਕੀ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "ਪਾਬੰਦੀ ਲਗਾਏ ਸੰਪਰਕ ਸੋਧੋ"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "ਅਕਾਊਂਟ:"
 
@@ -1665,464 +1677,381 @@ msgstr "ਪਾਬੰਦੀਸ਼ੁਦਾ ਸੰਪਰਕ"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "ਹਟਾਓ"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ਲਿੰਕ ਐਡਰੈੱਸ ਕਾਪੀ ਕਰੋ(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "ਨਵਾਂ ਸੰਪਰਕ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s ਉੱਤੇ ਪਾਬੰਦੀ?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
 "ਕੀ ਤੁਸੀਂ '%s' ਨੂੰ ਤੁਹਾਡੇ ਨਾਲ ਫੇਰ ਸੰਪਰਕ ਕਰਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "ਪਾਬੰਦੀ ਲਗਾਓ(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "ਇਹ ਸੰਪਰਕ ਨੂੰ ਅਸ਼ਲੀਲ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ(_R)"
 msgstr[1] "ਇਹਨਾਂ ਸੰਪਰਕਾਂ ਨੂੰ ਅਸ਼ਲੀਲ ਵਜੋਂ ਰਿਪੋਰਟ ਕਰੋ(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "ਮੈਂਬਰੀ ਮੰਗ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ਯੂਜ਼ਰ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "ਬਿਨ-ਗਰੁੱਪ"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "ਕੀ ਤੁਸੀਂ ਗਰੁੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "ਗਰੁੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "ਹਟਾਓ(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "ਗੱਲਬਾਤ(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "ਆਡੀਓ ਕਾਲ(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "ਫਾਇਲ ਭੇਜੋ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "ਪਸੰਦ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "ਜਾਣਕਾਰੀ(_m)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "ਸੋਧ(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "ਇਸ ਰੂਮ ਲਈ ਤੁਹਾਨੂੰ ਸੱਦਾ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "ਬਾਅਦ 'ਚ ਸੋਚੂ(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ਸੰਪਰਕ ਖੋਜ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "ਖੋਜ: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "ਕੋਈ ਸੰਪਰਕ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "ਤੁਹਾਡੀ ਜਾਣ-ਪਛਾਣ ਕਰਵਾਉਣ ਵਾਲਾ ਸੁਨੇਹਾ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "ਤੁਹਾਨੂੰ ਆਨਲਾਈਨ ਹੋਣ ਦਿਉ ਜੀ। ਧੰਨਵਾਦ!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ਸੰਪਰਕ ਚੁਣੋ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ਪੂਰਾ ਨਾਂ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "ਫੋਨ ਨੰਬਰ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ਈਮੇਲ ਐਡਰੈੱਸ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ਵੈੱਬਸਾਈਟ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "ਜਨਮਦਿਨ:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "ਆਖਰੀ ਵਾਰ ਵੇਖਿਆ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਇਸ ਨਾਲ:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "ਦੂਰਾ ਸੁਨੇਹਾ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ਚੈਨਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ਦੇਸ਼ ISO ਕੋਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ਦੇਸ਼:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ਹਾਲਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "ਸ਼ਹਿਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ਏਰੀਆ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ਡਾਕ ਕੋਡ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "ਗਲੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "ਇਮਾਰਤ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "ਮੰਜ਼ਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ਘਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "ਟੈਕਸਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "ਵੇਰਵਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "ਸ਼ੁੱਧਤਾ ਲੈਵਲ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "ਗਲਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "ਵਰਟੀਕਲ ਗਲਤੀ (ਮੀਟਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "ਹਰੀਜੱਟਲ ਗਲਤੀ (ਮੀਟਰ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "ਗਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "ਬੀਰਿੰਗ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "ਚੜ੍ਹਨ ਗਤੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "ਆਖਰੀ ਅੱਪਡੇਟ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "ਲੰਬਕਾਰੀ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "ਵਿਥਕਾਰ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "ਉਚਾਈ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "ਟਿਕਾਣਾ"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%R UTC %e %B %Y ਨੂੰ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "ਅਵਤਾਰ ਸੰਭਾਲੋ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ਅਵਤਾਰ ਸੰਭਾਲਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "ਉਪ-ਨਾਂ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "ਕਲਾਇਟ:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "ਨਿੱਜੀ ਵੇਰਵਾ"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "ਸੰਪਰਕ ਵੇਰਵਾ"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "ਪੂਰਾ ਨਾਂ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "ਫੋਨ ਨੰਬਰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "ਵੈੱਬਸਾਈਟ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "ਜਨਮਦਿਨ"
+
+#. 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 "ਆਖਰੀ ਵਾਰ ਵੇਖਿਆ/ਵੇਖੀ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਇਸ ਨਾਲ"
+
+#. 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 "ਦੂਰ ਸੁਨੇਹਾ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Work"
+msgid "work"
+msgstr "ਕੰਮ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "ਘਰ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Mobile"
+msgid "mobile"
+msgstr "ਮੋਬਾਈਲ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "ਪਸੰਦ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "ਪਸੰਦ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "ਡਾਕ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "ਪਾਰਸਲ"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "ਪਛਾਣਕਰਤਾ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "ਉਪ-ਨਾਂ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "ਜਾਣਕਾਰੀ ਮੰਗੀ ਗਈ…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "ਕਲਾਇਟ ਜਾਣਕਾਰੀ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "ਵਰਜਨ:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "ਕਲਾਇਟ:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "ਗਰੁੱਪ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2131,105 +2060,168 @@ msgstr ""
 "ਇੱਕ ਤੋਂ ਵੱਧ ਗਰੁੱਪ ਜਾਂ ਕੋਈ "
 "ਗਰੁੱਪ ਨਹੀਂ ਵੀ ਚੁਣ ਸਕਦੇ ਹੋ।"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "ਗਰੁੱਪ ਸ਼ਾਮਲ(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "ਗਰੁੱਪ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਪਛਾਣ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ ਜਾਵੇਗੀ:"
 msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਪਛਾਣਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ ਜਾਵੇਗੀ:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ਅੱਗੇ ਦਿੱਤੀ ਪਛਾਣ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲੱਗ ਸਕਦੀ:"
 msgstr[1] "ਅੱਗੇ ਦਿੱਤੀਆਂ ਪਛਾਣਾਂ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲੱਗ ਸਕਦੀ:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "ਲਿੰਕ ਕਰਨ ਲਈ ਸੰਪਰਕ ਚੁਣੋ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "ਨਵਾਂ ਸੰਪਰਕ ਝਲਕ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "ਖੱਬੇ ਪਾਸੇ ਲਿਸਟ ਵਿੱਚੋਂ ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇੱਕਠੇ ਜੋੜਿਆ ਜਾਵੇਗਾ।"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ ਸੋਧ"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "ਕਾਲ ਕਰਨ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਅਕਾਊਂਟ ਚੁਣੋ"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "ਕਾਲ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "ਮੋਬਾਈਲ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "ਕੰਮ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "ਘਰ"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "ਸੰਪਰਕ ਉੱਤੇ ਪਾਬੰਦੀ(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "ਗੱਲਬਾਤ(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "ਆਡੀਓ ਕਾਲ(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "ਪਿਛਲੀ ਗੱਲਬਾਤ(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ਫਾਇਲ ਭੇਜੋ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "ਮੇਰਾ ਡੈਸਕਟਾਪ ਸ਼ੇਅਰ ਕਰੋ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "ਪਸੰਦ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "ਸੰਪਰਕ ਵੇਰਵੇ ਨੂੰ ਵਰਤਣ ਲਈ gnome-contacts ਇੰਸਟਾਲ ਕਰੋ।"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "ਜਾਣਕਾਰੀ(_m)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "ਸੋਧ(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "ਇਸ ਰੂਮ ਲਈ ਤੁਹਾਨੂੰ ਸੱਦਾ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "ਗੱਲਬਾਤ ਰੂਮ ਲਈ ਸੱਦਾ(_I)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "ਸੰਪਰਕ ਸ਼ਾਮਲ(_A)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "ਹਟਾਓ ਅਤੇ ਪਾਬੰਦੀ ਲਗਾਓ(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "ਕੀ ਤੁਸੀਂ ਗਰੁੱਪ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "ਗਰੁੱਪ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "ਹਟਾਓ(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "ਕੀ ਤੁਸੀਂ ਸੰਪਰਕ '%s' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2239,7 +2231,11 @@ msgstr ""
 "ਸੰਪਰਕ ਹਟਾਏ "
 "ਜਾਣਗੇ, ਜੋ ਕਿ ਇਸ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ ਨੂੰ ਬਣਾਉਂਦੇ ਹਨ।"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "ਸੰਪਰਕ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2250,23 +2246,23 @@ msgstr[1] "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ %u ਸੰਪਰਕ ਰੱ�
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ਟਿਕਾਣਾ</b> (date) ਨੂੰ"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "ਫੋਨ ਜਾਂ ਮੋਬਾਇਲ ਜੰਤਰ ਤੋਂ ਆਨਲਾਈਨ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC ਨੈੱਟਵਰਕ ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "ਨੈੱਟਵਰਕ ਲਿਸਟ ਮੁੜ-ਸੈੱਟ ਕਰੋ(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "ਚੁਣੋ"
@@ -2279,257 +2275,262 @@ msgstr "ਨਵਾਂ ਸਰਵਰ"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"ਵੇਖਾਏ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ੍ਹਾਂ ਵੰਡ ਦਿਉ।"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ਲਿੰਕ ਕਰੋ(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ '%s' ਲਈ ਲਿੰਕ ਹਟਾਉਣਾ?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"ਕੀ ਤੁਸੀਂ ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ "
-"ਵੱਖ ਵੱਖ ਸੰਪਰਕਾਂ 'ਚ "
-"ਵੰਡ ਦੇਵੇਗਾ।"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "ਅਣ-ਲਿੰਕ ਕਰੋ(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "ਅਤੀਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "ਵੇਖਾਓ"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "ਖੋਜ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "%s ਵਿੱਚ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s ਨਾਲ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
-#| msgid "%d second ago"
-#| msgid_plural "%d seconds ago"
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ਸਕਿੰਟ"
 msgstr[1] "%s ਸਕਿੰਟ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
-#| msgid "%d minute ago"
-#| msgid_plural "%d minutes ago"
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s ਮਿੰਟ"
 msgstr[1] "%s ਮਿੰਟ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "%s ਨੂੰ ਕਾਲ ਲਈ, %s ਵਜੇ ਖਤਮ ਹੋਈ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "ਅੱਜ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "ਕੱਲ੍ਹ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
-#| msgctxt ""
-#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
-#| msgid "%e %B %Y"
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "ਕਿਸੇ ਵੀ ਸਮੇਂ"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "ਕੋਈ ਵੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "ਕੌਣ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "ਕਦੋਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "ਕੁਝ ਵੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "ਟੈਕਸਟ ਗੱਲਬਾਤ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "ਆਉਣ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "ਜਾਣ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "ਖੁੰਝੀਆਂ ਕਾਲਾਂ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "ਕੀ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ਕੀ ਤੁਸੀਂ ਪਿਛਲੀਆਂ ਗੱਲਾਬਾਤਾਂ ਤੋਂ ਸਭ ਲਾਗ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "ਸਭ ਸਾਫ਼ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "ਇਸ ਤੋਂ ਹਟਾਓ:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...</span>"
+msgid "_File"
+msgstr "ਫਾਇਲ(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "ਗੱਲਬਾਤ"
+#: ../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 "ਸੋਧ(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "ਸਭ ਅਤੀਤ ਹਟਾਓ..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "ਪਰੋਫਾਇਲ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "ਵਿਡੀਓ"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "ਗੱਲਬਾਤ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "ਸੋਧ(_E)"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "ਵਿਡੀਓ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "ਫਾਇਲ(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "ਸਫ਼ਾ 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ਸੰਪਰਕ ID:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "ਗੱਲਬਾਤ(_h)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "ਦਿੱਤਾ ਸੰਪਰਕ ਜਾਂ ਤਾਂ ਗਲਤ ਹੈ ਜਾਂ ਅਣਜਾਣ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr "ਸੰਪਰਕ ਇਹ ਕਿਸਮ ਦੀ ਸੰਵਾਦ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "ਦਿੱਤੇ ਸੰਪਰਕ ਨਾਲ ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "ਤੁਹਾਡੇ ਉੱਤੇ ਇਹ ਚੈਨਲ ਤੋਂ ਪਾਬੰਦੀ ਲਗਾਈ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "ਇਹ ਚੈਨਲ ਭਰਿਆ ਹੋਇਆ ਹੈ।"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "ਤੁਹਾਨੂੰ ਇਹ ਚੈਨਲ ਨੂੰ ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਚਾਹੀਦਾ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਦੇ ਦੌਰਾਨ ਅੱਗੇ ਨਹੀਂ ਜਾਇਆ ਜਾ ਸਕਦਾ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "ਅਧਿਕਾਰ ਪਾਬੰਦੀ ਹੈ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: ../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 "ਸੰਪਰਕ ਪਛਾਣ ਜਾਂ ਫੋਨ ਨੰਬਰ ਦਿਉ।"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "ਵਿਡੀਓ ਭੇਜੋ(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "ਵਿਡੀਓ ਕਾਲ(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "ਕਾਲ(_a)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "ਆਡੀਓ ਕਾਲ(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "ਨਵੀਂ ਕਾਲ"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<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"
@@ -2566,12 +2567,8 @@ msgstr "ਇਹ ਹਾਲਤ ਨੂੰ ਪਸੰਦੀਦਾ ਬਣਾਉਣ ਲ�
 msgid "Set status"
 msgstr "ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ..."
 
@@ -2579,7 +2576,7 @@ msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "ਨਵਾਂ %s ਅਕਾਊਂਟ"
@@ -2589,20 +2586,20 @@ msgid "Find:"
 msgstr "ਲੱਭੋ:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "ਮਿਲਦੇ ਕੇਸ(_c)"
+msgid "_Previous"
+msgstr "ਪਿੱਛੇ(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "ਅੱਗੇ(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "ਮਿਲਦੇ ਕੇਸ(_c)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "ਪਿੱਛੇ(_P)"
+msgid "Phrase not found"
+msgstr "ਸ਼ਬਦ ਨਹੀਂ ਲੱਭੇ"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2648,12 +2645,12 @@ msgstr "ਆਵਾਜ਼ ਕਾਲ ਖਤਮ ਕੀਤੀ"
 msgid "Edit Custom Messages"
 msgstr "ਪਸੰਦੀਦਾ ਸੁਨੇਹੇ ਸੋਧੋ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "%s ਉੱਤੇ ਸੁਨੇਹਾ ਸੋਧਿਆ ਗਿਆ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "ਸਧਾਰਨ"
 
@@ -2729,34 +2726,40 @@ msgid "Certificate hostname: %s"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਹੋਸਟ-ਨਾਂ: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "ਜਾਰੀ ਰੱਖੋ"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "ਜਾਰੀ ਰੱਖੋ(_o)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+#| msgid "User requested disconnect"
+msgid "Untrusted connection"
+msgstr "ਬੇਭਰੋਸੇਯੋਗ ਕੁਨੈਕਸ਼ਨ"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "ਇਹ ਕੁਨੈਕਸ਼ਨ ਭਰੋਸੇਯੋਗ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "ਭਵਿੱਖ ਦੇ ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਇਹ ਚੋਣ ਯਾਦ ਰੱਖੋ"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "ਸਰਟੀਫਿਕੇਟ ਵੇਰਵਾ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "ਫਾਇਲ ਚੁਣੋ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "ਫਾਇਲ ਸੰਭਾਲਣ ਲਈ ਲੋੜੀਦੀ ਥਾਂ ਨਹੀਂ ਹੈ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2766,7 +2769,7 @@ msgstr ""
 "ਟਿਕਾਣਾ ਚੁਣੋ "
 "ਜੀ।"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ਵਲੋਂ ਫਾਇਲ ਆ ਰਹੀ ਹੈ"
@@ -2938,39 +2941,31 @@ msgstr "ਦੱਖਣੀ"
 msgid "Vietnamese"
 msgstr "ਵੀਅਤਨਾਮੀ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਫਾਇਲਾਂ ਨਹੀਂ ਲੈ ਸਕਦਾ ਹੈ।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ।"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "ਕੋਈ ਗਲਤੀ ਸੁਨੇਹਾ ਨਹੀਂ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "ਤੁਰੰਤ ਸੁਨੇਹਾ (ਇੰਪੈਥੀ)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਕੁਨੈਕਟ ਨਾ ਕਰੋ"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਸੰਪਰਕ ਲਿਸਟ ਜਾਂ ਕੋਈ ਹੋਰ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- ਇੰਪੈਥੀ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "ਅਕਾਊਂਟ ਮੈਨੇਜਰ ਨਾਲ ਸੰਪਰਕ ਕਰਨ 'ਚ ਗਲਤੀ"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3020,238 +3015,89 @@ msgstr ""
 "੦੨੧੧੦-੧੩੦੧੫੯, "
 "ਅਮਰੀਕਾ ਨੂੰ ਲਿਖੋ।"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "ਗਨੋਮ ਲਈ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਕਲਾਇਟ"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ <aalam@users.sf.net) 2007, 2008, 2009, 2010\n"
 "http://www.satluj.com/"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "ਅਕਾਊਂਟ ਵੇਰਵਾ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "ਅਕਾਊਂਟ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "ਗਲਤੀ ਆਈ ਹੈ।"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "ਗਲਤੀ ਸੁਨੇਹਾ ਸੀ: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"ਤੁਸੀਂ ਜਾ ਕੇ ਆਪਣੇ ਅਕਾਊਂਟ ਵੇਰਵੇ ਵਿੱਚ ਆਪਣੇ ਵੇਰਵਾ ਲਈ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ "
-"ਇਹ ਸਹਾਇਕ ਬੰਦ ਕਰਕੇ "
-"ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "ਗਲਤੀ ਆਈ"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤੁਸੀਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "ਕੀ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"ਇੰਪੈਥੀ ਨਾਲ ਤੁਸੀਂ ਨੇੜਲੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਤੇ ਦੋਸਤਾਂ, ਮਿੱਤਰਾਂ, ਸਾਥੀਆਂ, ਜੋ ਕਿ ਗੂਗਲ "
-"ਟਾਕ, AIM, ਵਿੰਡੋਜ਼ "
-"ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ "
-"ਤੁਸੀਂ ਆਡੀਓ ਅਤੇ "
-"ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹੁਣ ਦੇਵਾਂਗਾ"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹੁੰਦਾ ਹਾਂ"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹੁਣ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "ਅਕਾਊਂਟ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "ਹਾਂ"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "ਨਹੀਂ, ਹੁਣ ਲਈ ਕਾਫ਼ੀ ਹੈ"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"ਇੰਪੈਥੀ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਵਿੱਚ ਮੌਜੂਦ ਕੁਨੈਕਟ ਹੋਏ ਲੋਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੱਭ ਅਤੇ ਗੱਲਬਾਤ "
-"ਕਰਵਾ ਸਕਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ "
-"ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ। ਤੁਸੀਂ "
-"ਇਹ ਵੇਰਵਾ ਬਾਅਦ "
-"ਵਿੱਚ ਵੀ ਸੌਖੀ ਤਰ੍ਹਾਂ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ 'ਅਕਾਊਂਟ' ਡਾਈਲਾਗ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਇਹ ਫੀਚਰ ਬੰਦ "
-"ਕਰ ਸਕਦੇ ਹੋ।"
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "ਸੋਧ->ਅਕਾਊਂਟ"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹਾਲੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦਾ(_n)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"ਤੁਸੀਂ ਆਪਣੇ ਲੋਕਲ ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੌਜੂਦ ਲੋਕਾਂ ਨਾਲ ਗੱਲਬਾਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ, ਕਿਉਂਕਿ, "
-"telepathy-salut "
-"ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ telepathy-salut "
-"ਪੈਕੇਜ ਇੰਸਟਾਲ ਕਰੋ "
-"ਅਤੇ ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਤੋਂ ਨੇੜਲੇ ਲੋਕ ਅਕਾਊਂਟ ਬਣਾਓ।"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸਹਾਇਕ"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "ਇੰਪੈਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ਤੁਹਾਡੇ ਅਕਾਊਂਟ %s ਨਾਲ ਸਬੰਧਿਤ ਕੁਝ ਨਾ-ਸੰਭਾਲੀਆਂ ਸੋਧਾਂ ਹਨ।"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "ਤੁਹਾਡਾ ਨਵਾਂ ਅਕਾਊਂਟ ਹਾਲੇ ਨਹੀਂ ਸੰਭਾਲਿਆ ਗਿਆ ਹੈ।"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "ਆਫਲਾਈਨ — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਖਤਮ  — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "ਆਫਲਾਈਨ — ਕੋਈ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "ਅਣਜਾਣ ਹਾਲਤ"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "ਆਫਲਾਈਨ — ਅਕਾਊਂਟ ਆਯੋਗ ਹੈ"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
-"ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+#: ../src/empathy-accounts-dialog.c:572
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਪੈਰਾਮੀਟਰ ਸੋਧ"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "ਸਰਵਰ ਤੋਂ ਤੁਹਾਡੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਲੈਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "ਆਪਣੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਸੋਧਣ ਲਈ ਆਨਲਾਈਨ ਜਾਉ।"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "ਕੁਨੈਕਸ਼ਨ ਪੈਰਾਮੀਟਰ ਸੋਧ(_E)..."
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਕੰਪਿਊਟਰ ਤੋਂ %s ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "ਇਹ ਸਰਵਰ ਤੋਂ ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਨਹੀਂ ਹਟਾਏਗਾ।"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3260,15 +3106,24 @@ msgstr ""
 "ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "ਯੋਗ(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "ਆਯੋਗ(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "ਛੱਡੋ(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਕਰੋ(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3280,19 +3135,15 @@ msgstr ""
 msgid "Add…"
 msgstr "…ਸ਼ਾਮਲ"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਇੰਸਟਾਲ ਨਹੀਂ"
+msgid "_Import…"
+msgstr "ਇੰਪੋਰਟ(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "ਪਰੋਟੋਕਾਲ:"
+msgid "Loading account information"
+msgstr "ਅਕਾਊਂਟ ਜਾਣਕਾਰੀ ਲੋਡ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3301,446 +3152,298 @@ msgstr ""
 "ਹੋ, ਲਈ ਬੈਕਐਂਡ ਇੰਸਟਾਲ "
 "ਕਰਨੀ ਪਵੇਗੀ।"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "ਇੰਪੋਰਟ(_I)…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr "ਕੋਈ ਪਰੋਟੋਕਾਲ ਬੈਕਐਂਡ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "ਇੰਪੈਥੀ ਪਰਮਾਣਕਿਤਾ ਕਲਾਇਟ"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "ਨੇੜਲੇ ਲੋਕ"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
-msgid "- Empathy Audio/Video Client"
-msgstr "- ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
-msgid "Empathy Audio/Video Client"
-msgstr "ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
-
-#: ../src/empathy-streamed-media-window.c:431
-msgid "Contrast"
-msgstr "ਕਨਟਰਾਸਟ"
-
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Brightness"
-msgstr "ਚਮਕ"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Gamma"
-msgstr "ਗਾਮਾ"
-
-#: ../src/empathy-streamed-media-window.c:542
-msgid "Volume"
-msgstr "ਆਵਾਜ਼"
-
-#: ../src/empathy-streamed-media-window.c:1110
-msgid "_Sidebar"
-msgstr "ਬਾਹੀ(_S)"
-
-#: ../src/empathy-streamed-media-window.c:1130
-msgid "Audio input"
-msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
-
-#: ../src/empathy-streamed-media-window.c:1134
-msgid "Video input"
-msgstr "ਵਿਡੀਓ ਆਉਟਪੁੱਟ"
-
-#: ../src/empathy-streamed-media-window.c:1140
-msgid "Dialpad"
-msgstr "ਡਾਇਲ-ਪੈਡ"
-
-#: ../src/empathy-streamed-media-window.c:1151
-msgid "Details"
-msgstr "ਵੇਰਵਾ"
-
-#. 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:1220
-#: ../src/empathy-call-window.c:1782
-#, c-format
-msgid "Call with %s"
-msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
-
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
-msgid "The IP address as seen by the machine"
-msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP ਐਡਰੈੱਸ"
-
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
-msgid "The IP address as seen by a server on the Internet"
-msgstr "IP ਐਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
-msgid "The IP address of the peer as seen by the other side"
-msgstr "ਪੀਅਰ ਦਾ IP ਐਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
-msgid "The IP address of a relay server"
-msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ"
-
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
-msgid "The IP address of the multicast group"
-msgstr "ਮਲਟੀਕਾਸਟ ਗਰੁੱਪ ਦਾ IP ਐਡਰੈੱਸ"
-
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
-msgid "Technical Details"
-msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
-
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ "
-"ਸਕਦਾ ਹੈ।"
-
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ "
-"ਸਕਦਾ ਹੈ।"
-
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, "
-"ਜੋ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ "
-"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
-
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
-msgid "There was a failure on the network"
-msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
-
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕੁਝ ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ "
-"ਅਤੇ ਮੱਦਦ "
-"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
-
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
-msgid "There was a failure in the call engine"
-msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
-msgid "The end of the stream was reached"
-msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
-
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
-msgid "Can't establish audio stream"
-msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
-msgid "Can't establish video stream"
-msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "ਆਡੀਓ"
+#: ../src/empathy-call-window.ui.h:1
+msgid "_Call"
+msgstr "ਕਾਲ ਕਰੋ(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "ਡੀਕੋਡਿੰਗ Codec:"
+msgid "_Microphone"
+msgstr "ਮਾਈਕਰੋਫੋਨ(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
+msgid "_Camera"
+msgstr "ਕੈਮਰਾ(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "ਡਾਇਲਪੈਡ ਵੇਖਾਓ"
+msgid "_Settings"
+msgstr "ਸੈਟਿੰਗ(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ਇੰਕੋਡਿੰਗ Codec:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "_View"
+msgstr "ਵੇਖੋ(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "ਬੰਦ ਕਰੋ"
+#: ../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 "ਮੱਦਦ(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ਮੌਜੂਦਾ ਕਾਲ ਬੰਦ ਕਰੋ"
+#: ../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 "ਸਮੱਗਰੀ(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ਲੋਕਲ ਉਮੀਦਵਾਰ:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "ਡੀਬੱਗ(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "ਮੈਨੂੰ ਵੱਧੋ-ਵੱਧ ਕਰੋ"
+msgid "Swap camera"
+msgstr "ਕੈਮਰਾ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "ਮੈਨੂੰ ਘੱਟੋ-ਘੱਟ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "ਰਿਮੋਟ ਉਮੀਦਵਾਰ:"
+msgid "Maximise me"
+msgstr "ਮੈਨੂੰ ਵੱਧੋ-ਵੱਧ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "ਆਡੀਓ ਭੇਜੋ"
+msgid "Disable camera"
+msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "ਵਿਡੀਓ ਭੇਜੋ"
+msgid "Hang up"
+msgstr "ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "ਡਾਇਲ-ਪੈਡ ਵੇਖੋ"
+msgid "Hang up current call"
+msgstr "ਮੌਜੂਦਾ ਕਾਲ ਬੰਦ ਕਰੋ"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "ਵਿਡੀਓ ਕਾਲ"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "ਵਿਡੀਓ ਕਾਲ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "ਆਡੀਓ ਕਾਲ ਸ਼ੁਰੂ ਕਰੋ"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "ਕੈਮਰਾ ਬਦਲੋ"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "ਆਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "ਵਿਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
+msgid "Show dialpad"
+msgstr "ਡਾਇਲ-ਪੈਡ ਵੇਖੋ"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "ਅਣਜਾਣ"
+msgid "Display the dialpad"
+msgstr "ਡਾਇਲਪੈਡ ਵੇਖਾਓ"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "ਵਿਡੀਓ ਭੇਜੋ"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "ਵਿਡੀਓ ਕਾਲ"
+msgid "Toggle video transmission"
+msgstr "ਵਿਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "ਕਾਲ ਕਰੋ(_C)"
+msgid "Send Audio"
+msgstr "ਆਡੀਓ ਭੇਜੋ"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "ਕੈਮਰਾ(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "ਸਮੱਗਰੀ(_C)"
+msgid "Toggle audio transmission"
+msgstr "ਆਡੀਓ ਟਰਾਂਸਮਿਸ਼ਨ ਬਦਲੋ"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "ਡੀਬੱਗ(_D)"
+msgid "Encoding Codec:"
+msgstr "ਇੰਕੋਡਿੰਗ Codec:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "ਮੱਦਦ(_H)"
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2540
+#: ../src/empathy-call-window.c:2541 ../src/empathy-call-window.c:2542
+#: ../src/empathy-call-window.c:2543
+msgid "Unknown"
+msgstr "ਅਣਜਾਣ"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "ਡੀਕੋਡਿੰਗ Codec:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "ਮਾਈਕਰੋਫੋਨ(_M)"
+msgid "Remote Candidate:"
+msgstr "ਰਿਮੋਟ ਉਮੀਦਵਾਰ:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "ਸੈਟਿੰਗ(_S)"
+msgid "Local Candidate:"
+msgstr "ਲੋਕਲ ਉਮੀਦਵਾਰ:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "ਵੇਖੋ(_V)"
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+msgid "Audio"
+msgstr "ਆਡੀਓ"
+
+#: ../src/empathy-chat-window.c:289
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨੀ?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ %s ਛੱਡੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਮੁੜ-ਜੁਆਇੰਨ ਹੋਣ ਤੱਕ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ "
+"ਨਹੀਂ "
+"ਕਰੋਗੇ।"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ ਗੱਲਬਾਤ ਰੂਮ ਬੰਦ ਹੋ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਮੁੜ-ਜੁਆਇੰਨ ਹੋਣ ਤੱਕ "
+"ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ "
+"ਕਰੋਗੇ।"
+msgstr[1] ""
+"ਇਹ ਵਿੰਡੋ ਬੰਦ ਕਰਨ ਨਾਲ %u ਗੱਲਬਾਤ ਰੂਮ ਬੰਦ ਹੋ ਜਾਵੇਗੇ। ਤੁਸੀਂ ਮੁੜ-ਜੁਆਇੰਨ ਹੋਣ ਤੱਕ "
+"ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ "
+"ਕਰੋਗੇ।"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "%s ਛੱਡਣਾ ਹੈ?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"ਤੁਸੀਂ ਇਹ ਗੱਲਬਾਤ ਰੂਪ ਤੋਂ ਕੋਈ ਵੀ ਸੁਨੇਹਾ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰੋਗੇ, ਜਦ ਤੱਕ ਤੁਸੀਂ "
+"ਮੁੜ-ਜੁਆਇੰਨ ਨਹੀਂ ਕਰਦੇ ਹੋ।"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+#| msgid "Level "
+msgid "Leave room"
+msgstr "ਰੂਮ ਛੱਡੋ"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
 msgstr[1] "%s (%d ਨਾ-ਪੜ੍ਹੇ)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ਅਤੇ %u ਹੋਰ)"
 msgstr[1] "%s (ਅਤੇ %u ਹੋਰ)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ)"
 msgstr[1] "%s (ਹੋਰਾਂ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ)"
 msgstr[1] "%s (ਸਭ ਤੋਂ %d ਨਾ-ਪੜ੍ਹੇ)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d ਸੁਨੇਹਾ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgstr[1] "%d ਸੁਨੇਹੇ ਭੇਜੇ ਜਾ ਰਹੇ ਹਨ"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "ਸੁਨੇਹਾ ਲਿਖਦਾ/ਲਿਖਦੀ ਹੈ।"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "ਸਾਫ਼ ਕਰੋ(_l)"
+msgid "_Conversation"
+msgstr "ਗੱਲਬਾਤ(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "ਸੰਪਰਕ(_o)"
+msgid "C_lear"
+msgstr "ਸਾਫ਼ ਕਰੋ(_l)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "ਬੰਦਾ-ਖੁਸ਼ ਸ਼ਾਮਲ(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ਪਸੰਦੀਦਾ ਗੱਲਬਾਤ-ਰੂਮ(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ(_P)..."
+msgid "Notify for All Messages"
+msgstr "ਸਭ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਦਿਓ"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "ਟੈਬ ਖੱਬੇ ਭੇਜੋ(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "ਟੈਬ ਸੱਜੇ ਭੇਜੋ(_R)"
+msgid "Invite _Participant…"
+msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ(_P)..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ਸਭ ਸੁਨੇਹਿਆਂ ਲਈ ਸੂਚਨਾ ਦਿਓ"
+msgid "C_ontact"
+msgstr "ਸੰਪਰਕ(_o)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "ਗੱਲਬਾਤ(_C)"
+msgid "_Tabs"
+msgstr "ਟੈਬਾਂ(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "ਟੈਬ ਵੱਖ ਕਰੋ(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ਪਸੰਦੀਦਾ ਗੱਲਬਾਤ-ਰੂਮ(_F)"
+msgid "_Previous Tab"
+msgstr "ਪਿਛਲੀ ਟੈਬ(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "ਅਗਲੀ ਟੈਬ(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "ਪਿਛਲੀ ਟੈਬ(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "ਬੰਦ ਕੀਤੀ ਟੈਬ ਵਾਪਸ ਖੋਲ੍ਹੋ(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "ਟੈਬ ਖੱਬੇ ਭੇਜੋ(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "ਟੈਬਾਂ(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "ਟੈਬ ਸੱਜੇ ਭੇਜੋ(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "ਬੰਦ ਕੀਤੀ ਟੈਬ ਵਾਪਸ ਖੋਲ੍ਹੋ(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "ਟੈਬ ਵੱਖ ਕਰੋ(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3754,101 +3457,100 @@ msgstr "ਰੂਮ"
 msgid "Auto-Connect"
 msgstr "ਆਟੋ-ਕੁਨੈਕਟ"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ਪਸੰਦੀਦਾ ਰੂਮ ਪਰਬੰਧ"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "ਆ ਰਹੀ ਵਿਡੀਓ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "ਆ ਰਹੀ ਕਾਲ"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ਤੁਹਾਨੂੰ ਵਿਡੀਓ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ਤੁਹਾਨੂੰ ਕਾਲ ਕਰ ਰਿਹਾ ਹੈ, ਕੀ ਤੁਸੀਂ ਜਵਾਬ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ਤੋਂ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "ਰੱਦ ਕਰੋ(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
 msgstr "ਜਵਾਬ ਦਿਓ(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:560
 msgid "_Answer with video"
 msgstr "ਵਿਡੀਓ ਨਾਲ ਜਵਾਬ(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s ਤੋਂ ਵਿਡੀਓ ਕਾਲ ਆ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "ਰੂਮ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s ਜੁਆਇੰਣ ਕਰਨ ਲਈ ਸੱਦਾ"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦ ਰਿਹਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "ਇਨਕਾਰ(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:800
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "ਦਾਖਲ(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ %s ਦਾਖਲ ਹੋਣ ਲਈ ਸੱਦਿਆ"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ਤੁਹਾਨੂੰ %s ਜੁਆਇੰਨ ਕਰਨ ਲਈ ਸੱਦਾ ਆਇਆ ਹੈ"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ਤੋਂ ਆ ਰਿਹਾ ਫਾਇਲ ਸੰਚਾਰ"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr ""
 "%s ਤੁਹਾਨੂੰ ਵੇਖਣ ਦਾ ਅਧਿਕਾਰ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ, ਜਦੋਂ ਵੀ ਤੁਸੀਂ ਆਨਲਾਈਨ ਹੋਵੋ"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
@@ -3858,105 +3560,105 @@ msgstr ""
 "ਸੁਨੇਹਾ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%3$s/s ਨਾਲ %2$s ਵਿੱਚੋਂ %1$s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s ਵਿੱਚੋਂ %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "%2$s ਵਲੋਂ \"%1$s\" ਆ ਰਹੀ ਹੈ"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜੀ ਜਾ ਰਹੀ ਹੈ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "%2$s ਤੋਂ \"%1$s\"  ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ਫਾਇਲ ਲੈਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ਫਾਇਲ ਭੇਜਣ ਦੌਰਾਨ ਗਲਤੀ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "%2$s ਤੋਂ \"%1$s\" ਮਿਲੀ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" %s ਨੂੰ ਭੇਜੀ"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ਫਾਇਲ ਸੰਚਾਰ ਪੂਰਾ ਹੋਇਆ"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "ਹੋਰ ਦਰਸ਼ਕਾਂ ਦੇ ਜਵਾਬ ਦੀ ਉਡੀਕ ਹੈ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "\"%s\" ਦੀ ਐਂਟੀਗਰੇਟੀ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "\"%s\" ਹੈਸ਼ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ਫਾਇਲ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "ਬਾਕੀ"
 
@@ -3968,7 +3670,12 @@ msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "ਲਿਸਟ ਵਿੱਚੋਂ ਪੂਰੇ ਹੋਏ, ਰੱਦ ਕੀਤੇ ਅਤੇ ਫੇਲ੍ਹ ਹੋਏ ਫਾਇਲ ਸੰਚਾਰ ਹਟਾਓ"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "ਇੰਪੋਰਟ(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3977,171 +3684,198 @@ msgstr ""
 "ਕਰਨ ਲਈ ਹੀ "
 "ਸਹਾਇਕ ਹੈ।"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "ਇੰਪੋਰਟ"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "ਪਰੋਟੋਕਾਲ"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "ਸਰੋਤ"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "ਪਾਸਵਰਡ ਦਿਓ"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ਡਿਸ-ਕੁਨੈਕਸ਼ਨ"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "ਤੁਹਾਨੂੰ ਇੱਥੇ ਸੰਪਰਕ ਵੇਖਣ ਲਈ ਇੱਕ ਅਕਾਊਂਟ ਸੈਟਅੱਪ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "ਕੋਈ ਮੇਲ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"ਅਫਸੋਸ, %s ਅਕਾਊਂਟ ਵਰਤਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ, ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ %s ਸਾਫਟਵੇਅਰ ਨੂੰ ਅੱਪਡੇਟ "
+"ਨਹੀਂ ਕਰਦੇ।"
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "...ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ ਕਰੋ"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "ਬੰਦ ਕਰੋ"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "ਮੁੜ-ਕੁਨੈਕਟ"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "ਅਕਾਊਂਟ ਸੋਧ"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "ਬੰਦ ਕਰੋ"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "ਟਾਪ ਅੱਪ %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "ਅਕਾਊਂਟ ਕਰੈਡਿਟ ਟਾਪਅੱਪ ਕਰੋ"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "ਟਾਪ ਅੱਪ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "ਸੰਪਰਕ"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "ਇੱਥੇ ਸੰਪਰਕ ਵੇਖਣ ਲਈ ਤੁਹਾਨੂੰ ਆਪਣੇ ਅਕਾਊਂਟ ਵਿੱਚੋਂ ਇੱਕ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਪਵੇਾਗ।"
+
+#. 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 "ਤੁਹਾਨੂੰ ਇੱਥੇ ਸੰਪਰਕ ਵੇਖਣ ਲਈ %s ਚਾਲੂ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "ਸੰਪਰਕ ਲਿਸਟ"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "ਅਕਾਊਂਟ ਸੈਟਿੰਗ"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "ਕਰੈਡਿਟ ਬਕਾਇਆ"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "ਨਵੀਂ ਗੱਲਬਾਤ(_N)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "ਸੰਪਰਕ ਲਿਸਟ 'ਚ ਲੱਭੋ(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "ਨਵੀਂ ਕਾਲ(_C)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "ਪਸੰਦ ਵਿੱਚ ਦਾਖਲ(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "ਸੰਪਰਕ ਲੱਭੋ(_S)…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "ਪਸੰਦ ਪਰਬੰਧ"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "ਸਧਾਰਨ ਆਕਾਰ(_o)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "ਨਵੀਂ ਕਾਲ(_C)..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ(_r)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "ਅਵਤਾਰਾਂ ਨਾਲ ਸਧਾਰਨ ਆਕਾਰ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "ਕਰੈਡਿਟ ਬਕਾਇਆ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "ਨਕਸ਼ੇ ਉੱਤੇ ਸੰਪਰਕ(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "ਅਕਾਊਂਟ(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "ਪਾਬੰਦੀਸ਼ੁਦਾ ਸੰਪਰਕ(_B)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "ਪਸੰਦ(_r)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "ਪਰੋਟੋਕਾਲ ਵੇਖੋ(_r)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ਸੰਪਰਕ ਲਿਸਟ 'ਚ ਲੱਭੋ(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "ਨਾਂ ਨਾਲ ਲੜੀਬੱਧ(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "ਹਾਲਤ ਨਾਲ ਲੜੀਬੱਧ(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "ਅਕਾਊਂਟ(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "ਅਵਤਾਰਾਂ ਨਾਲ ਸਧਾਰਨ ਆਕਾਰ(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "ਪਾਬੰਦੀਸ਼ੁਦਾ ਸੰਪਰਕ(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "ਸਧਾਰਨ ਆਕਾਰ(_o)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "ਸੰਖੇਪ ਆਕਾਰ(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "ਰੂਮ(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "ਦਾਖਲ(_J)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "ਨਵੀਂ ਗੱਲਬਾਤ..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "ਆਫਲਾਈਨ ਸੰਪਰਕ(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "ਰੂਮ(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "ਪਸੰਦ ਵਿੱਚ ਦਾਖਲ(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "ਸੰਪਰਕ ਲੱਭੋ(_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "ਪਸੰਦ ਪਰਬੰਧ"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "ਗੱਲਬਾਤ ਰੂਮ"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ਮੈਂਬਰ"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4154,22 +3888,27 @@ msgstr ""
 "ਪਾਸਵਰਡ ਲੋੜੀਦਾ: %s\n"
 "ਮੈਂਬਰ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "ਹਾਂ"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ਨਹੀਂ"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ਰੂਮ ਲਿਸਟ ਕਰਨਾ ਰੋਕਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ਰੂਮ ਲਿਸਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4178,6 +3917,10 @@ msgstr ""
 "ਦਾਖਲ ਹੋਣ ਵਾਸਤੇ ਰੂਮ ਨਾਂ ਦਿਓ ਜਾਂ ਲਿਸਟ ਵਿੱਚੋਂ ਇੱਕ ਜਾਂ ਵੱਧ ਰੂਮ ਉੱਤੇ ਕਲਿੱਕ ਕਰੋ।"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ਰੂਮ(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4185,503 +3928,954 @@ msgstr ""
 "ਸਰਵਰ ਦਿਓ, ਜਿਸ ਉੱਤੇ ਰੂਮ ਮੌਜੂਦ ਹਨ ਜਾਂ ਖਾਲੀ ਛੱਡੋ, ਜੇ ਰੂਮ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਸਰਵਰ ਉੱਤੇ "
 "ਹੀ ਮੌਜੂਦ ਹਨ।"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ਰੂਮ ਜੁਆਇੰਨ ਕਰੋ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ਰੂਮ ਲਿਸਟ ਲੋਡ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ਰੂਮ ਲਿਸਟ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ਰੂਮ(_R):"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "ਸੁਨੇਹਾ ਮਿਲਿਆ"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "ਨਵੀਂ ਗੱਲਬਾਤ"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਹੋਇਆ"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr "ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਇਆ"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ਸੰਪਰਕ ਬੰਦ ਕਰ ਗਿਆ"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "ਅਕਾਊਂਟ ਕੁਨੈਕਟ ਕੀਤਾ"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "ਅਕਾਊਂਟ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਹੋਇਆ"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "ਭਾਸ਼ਾ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "ਹੀਰ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ਰਾਂਝਾ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ਵੇ ਰਾਂਝਿਆ, ਰਾਂਝਿਆ, ਤੂੰ ਕਿੱਥੇ ਐਂ ਧੀਦੋ ਰਾਂਝਿਆਂ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "ਆਪਣੇ ਤਖਤ ਹਜ਼ਾਰੇ ਨੂੰ ਛੱਡ ਨੂੰ ਤੇਰੀਆਂ ਮੱਝੀਆਂ ਚਾਰੀਆਂ;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ਜਾਂ ਮੈਨੂੰ ਤੇਰੇ ਪਿਆਰ ਦੀ ਸੌਂਹ ਹੀਰੇ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "ਅਤੇ ਮੈਂ ਹੁਣ ਰਾਂਝੇ ਬਿਨਾਂ ਨਹੀਂ ਜਿਊਂਣਾ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ਕੀ ਮੈਂ ਹੋ ਸੁਣਾਂ ਜਾਂ ਮੈਂ ਇਸ ਬਾਰੇ ਗੱਲ ਕਰਾਂ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "ਰਾਂਝਾ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਗਿਆ ਹੈ"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "ਪਸੰਦ"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "ਖੁਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "ਦਿੱਖ"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "ਰਵੱਈਆ"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "ਗੱਲਬਾਤ 'ਚ ਸ਼ੁਰੂ:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
+msgid "new ta_bs"
+msgstr "ਨਵੀਆਂ ਟੈਬਾਂ(_b)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝਿਆ/ਰੁਝੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
+msgid "new _windows"
+msgstr "ਨਵੀਆਂ ਵਿੰਡੋਜ਼(_w)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁਝਿਆ/ਰੁਝੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਖੇਤਰ ਵਿੱਚ ਆ ਰਹੇ ਈਵੈਂਟ ਵੇਖਾਓ"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕੁਨੈਕਟ ਕਰੋ(_A)"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"ਈਕੋ ਰੱਦ ਕਰਨ ਨਾਲ ਦੂਜੇ ਵਿਅਕਤੀ ਨੂੰ ਤੁਹਾਡੀ ਆਵਾਜ਼ ਸਾਫ਼ ਸੁਣਨ ਵਿੱਚ ਮੱਦਦ ਮਿਲਦੀ ਹੈ, ਪਰ "
-"ਕੁਝ ਕੰਪਿਊਟਰਾਂ "
-"ਉੱਤੇ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਜਾਂ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਅਜੀਬ ਜਿਹੀਆਂ ਆਵਾਜ਼ ਸੁਣਨ "
-"ਜਾਂ ਕਾਲ ਦੇ ਦੌਰਾਨ "
-"ਰੁਕਾਵਟ ਆਏ ਤਾਂ ਈਕੋ ਰੱਦ ਕਰਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਕਾਲ ਮੁੜ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+msgid "Log conversations"
+msgstr "ਗੱਲਬਾਤ ਲਾਗ"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+msgid "Behavior"
+msgstr "ਰਵੱਈਆ"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+msgid "General"
+msgstr "ਆਮ"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
+msgid "_Enable bubble notifications"
+msgstr "ਬੁਲਬੁਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
+msgid "Disable notifications when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁੱਝਿਆ/ਰੁਝੀ ਤਾਂ ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "ਆਮ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "ਜਦੋਂ ਗੱਲਬਾਤ ਫੋਕਸ ਨਾ ਹੋਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ(_c)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "ਇੰਪੁੱਟ ਲੈਵਲ:"
+msgid "Enable notifications when a contact comes online"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਨਲਾਈਨ ਆਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "ਇੰਪੁੱਟ ਆਵਾਜ਼:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਆਫਲਾਈਨ ਜਾਵੇ ਤਾਂ ਸੂਚਨਾ ਦਿਓ"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "ਟਿਕਾਣਾ ਸਰੋਤ:"
+msgid "_Enable sound notifications"
+msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "ਗੱਲਬਾਤ ਲਾਗ"
+msgid "Disable sounds when _away or busy"
+msgstr "ਜਦੋਂ ਦੂਰ ਜਾਂ ਰੁਝਿਆ/ਰੁਝੀ ਹੋਵਾਂ ਤਾਂ ਸਾਊਂਡ ਬੰਦ ਰੱਖੋ(_a)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ਘਟਨਾਵਾਂ ਲਈ ਸਾਊਂਡ ਚਲਾਓ"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "ਸਾਊਂਡ"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "ਪਰਾਈਵੇਸੀ"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "ਕਾਲ ਕੁਆਲਟੀ ਸੁਧਾਰਨ ਲਈ ਗੂੰਜ ਰੱਦਕ ਕਰਨਾ (_echo cancellation) ਵਰਤੋਂ"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤੁਹਾਡੇ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕੁਝ ਵੀ "
-"ਵੇਖਾਇਆ ਨਹੀਂ "
-"ਜਾਵੇਗਾ। GPS ਧੁਰਾ ਮੁੱਲ 1 ਦਸ਼ਮਲਵ ਥਾਂ ਨਾਲ ਸ਼ੁੱਧ ਹੋਣਗੇ।"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "ਖੁਸ਼ ਚਿੱਤਰਾਂ ਵਾਂਗ ਵੇਖੋ(_s)"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "ਰੂਮ ਵਿੱਚ ਸੰਪਰਕ ਲਿਸਟ ਵੇਖੋ(_l)"
+"ਈਕੋ ਰੱਦ ਕਰਨ ਨਾਲ ਦੂਜੇ ਵਿਅਕਤੀ ਨੂੰ ਤੁਹਾਡੀ ਆਵਾਜ਼ ਸਾਫ਼ ਸੁਣਨ ਵਿੱਚ ਮੱਦਦ ਮਿਲਦੀ ਹੈ, ਪਰ "
+"ਕੁਝ ਕੰਪਿਊਟਰਾਂ "
+"ਉੱਤੇ ਸਮੱਸਿਆ ਆ ਸਕਦੀ ਹੈ। ਜੇ ਤੁਹਾਨੂੰ ਜਾਂ ਹੋਰ ਵਿਅਕਤੀ ਨੂੰ ਅਜੀਬ ਜਿਹੀਆਂ ਆਵਾਜ਼ ਸੁਣਨ "
+"ਜਾਂ ਕਾਲ ਦੇ ਦੌਰਾਨ "
+"ਰੁਕਾਵਟ ਆਏ ਤਾਂ ਈਕੋ ਰੱਦ ਕਰਨ ਨੂੰ ਬੰਦ ਕਰਕੇ ਕਾਲ ਮੁੜ ਕਰਕੇ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "ਸਾਊਂਡ"
+msgid "_Publish location to my contacts"
+msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ੍ਹਾਂ ਲਈ ਤੁਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
+"ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਉਣ ਦਾ ਮਤਲਬ ਹੈ ਕਿ ਤੁਹਾਡੇ ਸ਼ਹਿਰ, ਸੂਬਾ ਅਤੇ ਦੇਸ਼ ਤੋਂ ਵੱਧ ਕੁਝ ਵੀ "
+"ਵੇਖਾਇਆ ਨਹੀਂ "
+"ਜਾਵੇਗਾ। GPS ਧੁਰਾ ਮੁੱਲ 1 ਦਸ਼ਮਲਵ ਥਾਂ ਨਾਲ ਸ਼ੁੱਧ ਹੋਣਗੇ।"
 
+#. 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 "Themes"
-msgstr "ਥੀਮ"
+msgid "_Reduce location accuracy"
+msgstr "ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਓ(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "ਬਦਲ:"
+msgid "Privacy"
+msgstr "ਪਰਾਈਵੇਸੀ"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "ਸ਼ੁਰੂ ਸਮੇਂ ਆਟੋਮੈਟਿਕ ਹੀ ਕੁਨੈਕਟ ਕਰੋ(_A)"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "ਸੈੱਲਫੋਨ(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "ਬੁਲਬੁਲਾ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "ਨੈੱਟਵਰਕ (IP, Wi-Fi)(_N) "
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "ਸਾਊਂਡ ਨੋਟੀਫਿਕੇਸ਼ਨ ਚਾਲੂ(_E)"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "ਟਿਕਾਣਾ ਸਰੋਤ:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "ਨੈੱਟਵਰਕ (IP, Wi-Fi)(_N) "
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"ਭਾਸ਼ਾ ਦੀ ਲਿਸਟ ਵੇਖਾ ਰਿਹਾ ਹੈ, ਜਿੰਨ੍ਹਾਂ ਲਈ ਤੁਹਾਡੇ ਕੋਲ ਸ਼ਬਦ-ਕੋਸ਼ ਇੰਸਟਾਲ ਹੈ।"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
+msgid "Enable spell checking for languages:"
+msgstr "ਭਾਸ਼ਾਵਾਂ ਲਈ ਸ਼ਬਦ-ਜੋੜ ਚੈੱਕ ਕਰਨਾ ਯੋਗ:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "ਮੇਰੇ ਸੰਪਰਕਾਂ ਲਈ ਟਿਕਾਣਾ ਦੱਸੋ(_P)"
+msgid "Spell Checking"
+msgstr "ਸ਼ਬਦਜੋੜ ਜਾਂਚ"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "ਗੱਲਬਾਤ ਥੀਮ(_e):"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "ਟਿਕਾਣਾ ਸ਼ੁੱਧਤਾ ਘਟਾਓ(_R)"
+msgid "Variant:"
+msgstr "ਬਦਲ:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "ਥੀਮ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "ਹਾਲਤ"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "ਬੰਦ ਕਰੋ(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "ਸੰਪਰਕ ਨੂੰ ਫੇਰ ਕਾਲ ਕਰੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "ਕੈਮਰਾ ਚਾਲੂ"
-
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰਕੇ ਵਿਡੀਓ ਭੇਜਣਾ ਰੋਕੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "ਕੈਮਰਾ ਚਾਲੂ ਕਰੋ ਤੇ ਵਿਡੀਓ ਭੇਜੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "ਕੈਮਰਾ ਚਲਾਓ, ਪਰ ਵਿਡੀਓ ਨਾ ਭੇਜੋ"
-
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "ਝਲਕ"
-
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "ਰੀ-ਡਾਇਲ"
-
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "ਵਿਡੀਓ(_i)"
-
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "ਵਿਡੀਓ ਬੰਦ"
-
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "ਵਿਡੀਓ ਚਾਲੂ"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ਵਿਡੀਓ ਝਲਕ"
-
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "ਸੰਪਰਕ ਮੈਪ ਝਲਕ"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1598
 msgid "Save"
 msgstr "ਸੰਭਾਲੋ"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1658
+msgid "Pastebin link"
+msgstr "Pastebin ਲਿੰਕ"
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin response"
+msgstr "Pastebin ਜਵਾਬ"
+
+#: ../src/empathy-debug-window.c:1671
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1674
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "ਇੱਕ ਵਾਰ ਚੇਪਣ ਲਈ ਡਾਟਾ ਬਹੁਤ ਵੱਡਾ ਹੈ। ਲਾਗ ਨੂੰ ਫਾਇਲ ਵਿੱਚ ਸੰਭਾਲੋ।"
+
+#: ../src/empathy-debug-window.c:1903
 msgid "Debug Window"
 msgstr "ਡੀਬੱਗ ਵਿੰਡੋ"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1961
+msgid "Send to pastebin"
+msgstr "pastebin ਲਈ ਭੇਜੋ"
+
+#: ../src/empathy-debug-window.c:2000
 msgid "Pause"
 msgstr "ਵਿਰਾਮ"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2012
 msgid "Level "
 msgstr "ਲੈਵਲ "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2031
 msgid "Debug"
 msgstr "ਡੀਬੱਗ"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2036
 msgid "Info"
 msgstr "ਜਾਣਕਾਰੀ"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2041 ../src/empathy-debug-window.c:2087
 msgid "Message"
 msgstr "ਸੁਨੇਹਾ"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2046
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2051
 msgid "Critical"
 msgstr "ਨਾਜ਼ੁਕ"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2056
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2075
 msgid "Time"
 msgstr "ਸਮਾਂ"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2078
 msgid "Domain"
 msgstr "ਡੋਮੇਨ"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2080
 msgid "Category"
 msgstr "ਕੈਟਾਗਰੀ"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2082
 msgid "Level"
 msgstr "ਲੈਵਲ"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2105
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "ਚੁਣਿਆ ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਰਿਮੋਟ ਡੀਬੱਗ ਇਕਸਟੈਨਸ਼ਨ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "ਭਾਗ ਲੈਣ ਵਾਲਿਆਂ ਨੂੰ ਸੱਦਾ"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸੱਦਣ ਲਈ ਸੰਪਰਕ ਚੁਣੋ:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "ਸੱਦਾ"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ਕੋਈ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ; ਕੁਝ ਵੀ ਕਰੋ (ਇੰਪੋਰਟ ਆਦਿ) ਅਤੇ ਬੰਦ ਕਰੋ"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "ਜੇ ਕੋਈ \"ਨੇੜਲੇ ਲੋਕ\" ਅਕਾਊਂਟ ਹੋਵੇ ਤਾਂ ਕੋਈ ਵੀ ਡਾਈਲਾਗ ਨਾ ਵੇਖਾਓ"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "ਦਿੱਤਾ ਅਕਾਊਂਟ ਸ਼ੁਰੂ ਵੇਲੇ ਚੁਣੋ (ਜਿਵੇਂ gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "ਇੰਪੈਥੀ ਅਕਾਊਂਟ"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "ਇੱਕ ਖਾਸ ਸਰਵਿਸ ਵੇਖਾਓ"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "ਇੰਪੈਥੀ ਡੀਬੱਗਰ"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- ਇੰਪੈਥੀ ਚੈਟ ਕਲਾਇਟ"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "ਜਵਾਬ"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "ਜਵਾਬ ਦਿਓ"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:206
 msgid "Answer with video"
 msgstr "ਵਿਡੀਓ ਨਾਲ ਜਵਾਬ"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "ਇਨਕਾਰ"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "ਮਨਜ਼ੂਰ"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:239
 msgid "Provide"
 msgstr "ਦਿਉ"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਕਾਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੀ ਹੈ, ਪਰ ਤੁਸੀਂ ਹੋਰ ਕਾਲ ਉੱਤੇ ਸੀ।"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
+#, c-format
+msgid "Call with %s"
+msgstr "%s ਲਈ ਕਾਲ ਕਰੋ"
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "ਮਸ਼ੀਨ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ IP ਐਡਰੈੱਸ"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "IP ਐਡਰੈੱਸ, ਜੋ ਕਿ ਇੰਟਰਨੈੱਟ ਉੱਤੇ ਸਰਵਰ ਵਲੋਂ ਵੇਖਿਆ ਜਾਂਦਾ ਹੈ"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "ਪੀਅਰ ਦਾ IP ਐਡਰੈੱਸ, ਜੋ ਦੂਜੇ ਪਾਸੇ ਵਿਖਾਈ ਦਿੰਦਾ ਹੈ"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "ਰੀਲੇਅ ਸਰਵਰ ਦਾ IP ਐਡਰੈੱਸ"
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "ਮਲਟੀਕਾਸਟ ਗਰੁੱਪ ਦਾ IP ਐਡਰੈੱਸ"
+
+#: ../src/empathy-call-window.c:2886
 msgid "On hold"
 msgstr "ਹੋਲਡ ਹੈ"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2889
 msgid "Mute"
 msgstr "ਚੁੱਪ"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2891
 msgid "Duration"
 msgstr "ਅੰਤਰਾਲ"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2894
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:2990
+msgid "Technical Details"
+msgstr "ਤਕਨੀਕੀ ਵੇਰਵਾ"
+
+#: ../src/empathy-call-window.c:3029
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਆਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ "
+"ਸਕਦਾ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3034
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s ਦਾ ਸਾਫਟਵੇਅਰ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਮੌਜੂਦ ਕਿਸੇ ਵੀ ਵਿਡੀਓ ਫਾਰਮੈਟ ਨੂੰ ਸਮਝ ਨਹੀਂ "
+"ਸਕਦਾ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3040
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ। ਤੁਹਾਡੇ ਵਿੱਚੋਂ ਕੋਈ ਅਜਿਹੇ ਨੈੱਟਵਰਕ ਉੱਤੇ ਹੈ, "
+"ਜੋ ਸਿੱਧਾ ਕੁਨੈਕਸ਼ਨ "
+"ਬਣਾਉਣ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3046
+msgid "There was a failure on the network"
+msgstr "ਨੈੱਟਵਰਕ ਉੱਤੇ ਸਮੱਸਿਆ ਆਈ ਹੈ"
+
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਆਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
+
+#: ../src/empathy-call-window.c:3053
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "ਇਹ ਕਾਲ ਲਈ ਲੋੜੀਦੇ ਵਿਡੀਓ ਫਾਰਮੈਟ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਉੱਤੇ ਇੰਸਟਾਲ ਨਹੀਂ ਹਨ"
+
+#: ../src/empathy-call-window.c:3065
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"ਟੈਲੀਪੈਥੀ ਭਾਗ ਵਿੱਚ ਕੁਝ ਗੜਬੜ ਹੋ ਗਈ ਹੈ। <a href=\"%s\">ਇਹ ਬੱਗ ਜਾਣਕਾਰੀ</a> ਦਿਓ "
+"ਅਤੇ ਮੱਦਦ "
+"ਮੇਨੂ ਵਿੱਚੋਂ 'ਡੀਬੱਗ' ਵਿੰਡੋ ਤੋਂ ਲੈ ਕੇ ਲਾਗ ਨੱਥੀ ਕਰੋ।"
+
+#: ../src/empathy-call-window.c:3074
+msgid "There was a failure in the call engine"
+msgstr "ਕਾਲ ਇੰਜਣ ਵਿੱਚ ਕੋਈ ਸਮੱਸਿਆ ਆਈ ਹੈ"
+
+#: ../src/empathy-call-window.c:3077
+msgid "The end of the stream was reached"
+msgstr "ਸਟਰੀਮ ਦਾ ਅੰਤ ਆ ਗਿਆ ਹੈ"
+
+#: ../src/empathy-call-window.c:3117
+msgid "Can't establish audio stream"
+msgstr "ਆਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: ../src/empathy-call-window.c:3127
+msgid "Can't establish video stream"
+msgstr "ਵਿਡੀਓ ਸਟਰੀਮ ਬਣਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: ../src/empathy-call-window.c:3164
+#, c-format
+msgid "Your current balance is %s."
+msgstr "ਤੁਹਾਡਾ ਮੌਜੂਦਾ ਬਕਾਇਆ %s ਹੈ।"
+
+#: ../src/empathy-call-window.c:3168
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "ਅਫਸੋਸ, ਤੁਹਾਡੇ ਕੋਲ ਕਾਲ ਕਰਨ ਲਈ ਪੂਰਾ ਕਰੈਡਿਟ ਨਹੀਂ ਹੈ।"
+
+#: ../src/empathy-call-window.c:3170
+#| msgid "Top Up..."
+msgid "Top Up"
+msgstr "ਟਾਪ ਅੱਪ"
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
+
+#: ../src/empathy-call.c:224
+msgid "Empathy Audio/Video Client"
+msgstr "ਇੰਪੈਥੀ ਆਡੀਓ/ਵਿਡੀਓ ਕਲਾਇਟ"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "ਮਿਲਦਾ ਆਕਾਰ(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "ਤੁਹਾਡੇ ਕੋਲ ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਹੈ?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "ਨਵਾਂ ਅਕਾਊਂਟ ਸ਼ਾਮਿਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "ਨੇੜਲੇ ਲੋਕ"
+
+#: ../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 ""
+"ਇੰਪੈਥੀ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਵਿੱਚ ਮੌਜੂਦ ਕੁਨੈਕਟ ਹੋਏ ਲੋਕਾਂ ਨੂੰ ਆਟੋਮੈਟਿਕ ਲੱਭ ਅਤੇ ਗੱਲਬਾਤ "
+"ਕਰਵਾ ਸਕਦਾ ਹੈ। ਜੇ ਤੁਸੀਂ "
+"ਇਹ ਫੀਚਰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਚੈੱਕ ਕਰੋ ਕਿ ਹੇਠਾਂ ਦਿੱਤੀ ਜਾਣਕਾਰੀ ਪੂਰੀ ਹੈ।"
+
+#: ../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 ""
+"ਤੁਸੀਂ ਇਹ ਵੇਰਵਾ ਬਾਅਦ ਵਿੱਚ ਬਦਲ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ ਫੀਚਰ ਨੂੰ ਸੰਪਰਕ ਸੂਚੀ ਵਿੱਚੋਂ<span "
+"style=\"italic\">ਸੋਧ "
+"→ਅਕਾਊਂਟ</span> ਦੀ ਚੋਣ ਕਰਕੇ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "Call volume"
+#~ msgstr "ਕਾਲ ਆਵਾਜ਼"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "ਕਾਲ ਆਵਾਜ਼, ਫੀਸਦੀ ਵਜੋਂ।"
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "ਇੰਪੈਥੀ ਨੇ ਬਟਰਫਲਾਈ ਲਾਗ ਮਾਈਗਰੇਟ ਕੀਤਾ"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "ਕੀ ਇੰਪੈਥੀ ਬਟਰਫਲਾਈ ਲਾਗ ਕਰ ਚੁੱਕਿਆ ਹੈ।"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "ਸਾਕਟ ਟਾਈਪ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "ਅਕਾਊਂਟ %s ਨੂੰ %s ਰਾਹੀਂ ਸੋਧਿਆ ਗਿਆ ਹੈ।"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "ਅਕਾਊਂਟ %s ਇੰਪੈਥੀ 'ਚ ਸੋਧਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "ਮੇਰੇ ਵੈੱਬ ਅਕਾਊਂਟ ਚਲਾਉ"
+
+#~ msgid "Edit %s"
+#~ msgstr "%s ਬਦਲੋ"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "ਰੱਦ ਕਰੋ(_n)"
+
+#~ msgid "Personal Information"
+#~ msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ"
+
+#~ msgid "Ungrouped"
+#~ msgstr "ਬਿਨ-ਗਰੁੱਪ"
+
+#~ msgid "Favorite People"
+#~ msgstr "ਪਸੰਦ ਦੇ ਲੋਕ"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "ਸੋਧ(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "ਸੰਪਰਕ ਚੁਣੋ"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "ਲਿੰਕ ਕਰਨ ਲਈ ਸੰਪਰਕ ਚੁਣੋ"
+
+#~ msgid "New contact preview"
+#~ msgstr "ਨਵਾਂ ਸੰਪਰਕ ਝਲਕ"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "ਖੱਬੇ ਪਾਸੇ ਲਿਸਟ ਵਿੱਚੋਂ ਚੁਣੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇੱਕਠੇ ਜੋੜਿਆ ਜਾਵੇਗਾ।"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "ਸੰਪਰਕ ਲਿੰਕ ਕਰੋ"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "ਲਿੰਕ ਹਟਾਓ(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "ਵੇਖਾਏ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਇਸ 'ਚ ਮੌਜੂਦਾ ਸੰਪਰਕਾਂ 'ਚ ਪੂਰੀ ਤਰ੍ਹਾਂ ਵੰਡ ਦਿਉ।"
+
+#~ msgid "_Link"
+#~ msgstr "ਲਿੰਕ ਕਰੋ(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕ '%s' ਲਈ ਲਿੰਕ ਹਟਾਉਣਾ?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ਕੀ ਤੁਸੀਂ ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਹ ਲਿੰਕ ਕੀਤੇ ਸੰਪਰਕਾਂ ਨੂੰ ਵੱਖ ਵੱਖ ਸੰਪਰਕਾਂ "
+#~ "'ਚ ਵੰਡ ਦੇਵੇਗਾ।"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "ਅਣ-ਲਿੰਕ ਕਰੋ(_U)"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ਸੰਪਰਕ ID:"
+
+#~ msgid "C_hat"
+#~ msgstr "ਗੱਲਬਾਤ(_h)"
+
+#~ msgid "Send _Video"
+#~ msgstr "ਵਿਡੀਓ ਭੇਜੋ(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "ਕਾਲ(_a)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "ਆਪਣੀ ਮੌਜੂਦਗੀ ਅਤੇ ਮੌਜੂਦਾ ਹਾਲਤ ਸੈੱਟ ਕਰੋ"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਫਾਇਲਾਂ ਨਹੀਂ ਲੈ ਸਕਦਾ ਹੈ।"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "ਚੁਣਿਆ ਸੰਪਰਕ ਆਫਲਾਈਨ ਹੈ।"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "ਅਕਾਊਂਟ ਵੇਰਵਾ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "ਅਕਾਊਂਟ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "There was an error."
+#~ msgstr "ਗਲਤੀ ਆਈ ਹੈ।"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "ਗਲਤੀ ਸੁਨੇਹਾ ਸੀ: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "ਤੁਸੀਂ ਜਾ ਕੇ ਆਪਣੇ ਅਕਾਊਂਟ ਵੇਰਵੇ ਵਿੱਚ ਆਪਣੇ ਵੇਰਵਾ ਲਈ ਮੁੜ ਕੋਸ਼ਿਸ਼ ਕਰ ਸਕਦੇ ਹੋ ਜਾਂ ਇਹ ਸਹਾਇਕ ਬੰਦ "
+#~ "ਕਰਕੇ ਬਾਅਦ ਵਿੱਚ ਸੋਧ ਮੇਨੂ ਵਿੱਚੋਂ ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "An error occurred"
+#~ msgstr "ਗਲਤੀ ਆਈ"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਤੁਸੀਂ ਸੈੱਟਅੱਪ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "ਆਪਣੇ ਅਕਾਊਂਟ ਦਾ ਵੇਰਵਾ ਦਿਓ"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "ਕਿਸ ਕਿਸਮ ਦਾ ਚੈਟ ਅਕਾਊਂਟ ਤੁਸੀਂ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "ਕੀ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "ਨਵੇਂ ਅਕਾਊਂਟ ਲਈ ਵੇਰਵਾ ਦਿਓ"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "ਇੰਪੈਥੀ ਨਾਲ ਤੁਸੀਂ ਨੇੜਲੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਤੇ ਦੋਸਤਾਂ, ਮਿੱਤਰਾਂ, ਸਾਥੀਆਂ, ਜੋ ਕਿ ਗੂਗਲ ਟਾਕ, AIM, ਵਿੰਡੋਜ਼ "
+#~ "ਲਾਈਨ ਅਤੇ ਹੋਰ ਚੈਤ ਪਰੋਗਰਾਮਾਂ ਨਾਲ ਗੱਲਾਂ ਕਰ ਸਕਦੇ ਹੋ। ਮਾਈਕਰੋਫੋਨ ਜਾਂ ਵੈੱਬ ਕੈਮ ਨਾਲ ਤੁਸੀਂ ਆਡੀਓ ਅਤੇ "
+#~ "ਵਿਡੀਓ ਕਾਲ ਵੀ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਕੋਈ ਅਕਾਊਂਟ ਹੈ, ਜੋ ਕਿ ਤੁਸੀਂ ਹੋਰ ਚੈਟ ਪਰੋਗਰਾਮ ਨਾਲ ਵਰਤਦੇ ਰਹੇ ਹੋ?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "ਹਾਂ, ਮੇਰਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਲਵੋ "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "ਹਾਂ, ਮੈਂ ਆਪਣਾ ਅਕਾਊਂਟ ਵੇਰਵਾ ਹੁਣ ਦੇਵਾਂਗਾ"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "ਨਹੀਂ, ਮੈਂ ਨਵਾਂ ਅਕਾਊਂਟ ਚਾਹੁੰਦਾ ਹਾਂ"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ਨਹੀਂ, ਮੈਂ ਸਿਰਫ਼ ਹੁਣ ਆਪਣੇ ਨੇੜੇ ਆਨਲਾਈਨ ਲੋਕਾਂ ਨੂੰ ਵੇਖਣਾ ਚਾਹੁੰਦਾ ਹਾਂ"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "ਅਕਾਊਂਟ ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਇੰਪੋਰਟ ਕਰਨੇ ਚਾਹੁੰਦੇ ਹੋ:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ਨਹੀਂ, ਹੁਣ ਲਈ ਕਾਫ਼ੀ ਹੈ"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "ਸੋਧ->ਅਕਾਊਂਟ"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "ਮੈਂ ਇਹ ਫੀਚਰ ਹਾਲੇ ਚਾਲੂ ਨਹੀਂ ਕਰਨਾ ਚਾਹੁੰਦਾ(_n)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "ਤੁਸੀਂ ਆਪਣੇ ਲੋਕਲ ਨੈੱਟਵਰਕ ਉੱਤੇ ਮੌਜੂਦ ਲੋਕਾਂ ਨਾਲ ਗੱਲਬਾਤ ਨਹੀਂ ਕਰ ਸਕੋਗੇ, ਕਿਉਂਕਿ, telepathy-salut "
+#~ "ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ। ਜੇ ਤੁਸੀਂ ਇਹ ਫੀਚਰ ਚਾਲੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ telepathy-salut ਪੈਕੇਜ ਇੰਸਟਾਲ "
+#~ "ਕਰੋ ਅਤੇ ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਤੋਂ ਨੇੜਲੇ ਲੋਕ ਅਕਾਊਂਟ ਬਣਾਓ।"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "ਸੁਨੇਹੇ ਅਤੇ VoIP ਅਕਾਊਂਟ ਸਹਾਇਕ"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "ਇੰਪੈਥੀ ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ਆਪਣੇ ਮੌਜੂਦਾ ਅਕਾਊਂਟ ਇੰਪੋਰਟ ਕਰੋ"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "ਨਿੱਜੀ ਵੇਰਵਾ ਦਿਓ"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "ਤੁਸੀਂ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਉਣ ਜਾ ਰਹੇ ਹੋ, ਜੋ ਕਿ ਤੁਹਾਡੇ ਬਦਲਾਅ ਖਤਮ ਕਰ ਦੇਵੇਗਾ।\n"
+#~ "ਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#~ msgid "Protocol:"
+#~ msgstr "ਪਰੋਟੋਕਾਲ:"
+
+#~ msgid "Contrast"
+#~ msgstr "ਕਨਟਰਾਸਟ"
+
+#~ msgid "Brightness"
+#~ msgstr "ਚਮਕ"
+
+#~ msgid "Gamma"
+#~ msgstr "ਗਾਮਾ"
+
+#~ msgid "Volume"
+#~ msgstr "ਆਵਾਜ਼"
+
+#~ msgid "_Sidebar"
+#~ msgstr "ਬਾਹੀ(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "ਆਡੀਓ ਆਉਟਪੁੱਟ"
+
+#~ msgid "Video input"
+#~ msgstr "ਵਿਡੀਓ ਆਉਟਪੁੱਟ"
+
+#~ msgid "Dialpad"
+#~ msgstr "ਡਾਇਲ-ਪੈਡ"
+
+#~ msgid "Details"
+#~ msgstr "ਵੇਰਵਾ"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "ਅਣਜਾਣ"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "ਕੁਨੈਕਟ ਹੈ -- %d:%02dm"
+
+#~ msgid "_Personal Information"
+#~ msgstr "ਨਿੱਜੀ ਜਾਣਕਾਰੀ(_P)"
+
+#~ msgid "Input level:"
+#~ msgstr "ਇੰਪੁੱਟ ਲੈਵਲ:"
+
+#~ msgid "Input volume:"
+#~ msgstr "ਇੰਪੁੱਟ ਆਵਾਜ਼:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "ਨਵੀਆਂ ਗੱਲਾਬਾਤਾਂ ਵੱਖ ਵੱਖ ਵਿੰਡੋ ਵਿੱਚ ਖੋਲ੍ਹੋ(_O)"
+
+#~ msgid "Call the contact again"
+#~ msgstr "ਸੰਪਰਕ ਨੂੰ ਫੇਰ ਕਾਲ ਕਰੋ"
+
+#~ msgid "Camera Off"
+#~ msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰੋ"
+
+#~ msgid "Camera On"
+#~ msgstr "ਕੈਮਰਾ ਚਾਲੂ"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "ਕੈਮਰਾ ਬੰਦ ਕਰਕੇ ਵਿਡੀਓ ਭੇਜਣਾ ਰੋਕੋ"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "ਕੈਮਰਾ ਚਾਲੂ ਕਰੋ ਤੇ ਵਿਡੀਓ ਭੇਜੋ"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "ਕੈਮਰਾ ਚਲਾਓ, ਪਰ ਵਿਡੀਓ ਨਾ ਭੇਜੋ"
+
+#~ msgid "Preview"
+#~ msgstr "ਝਲਕ"
+
+#~ msgid "Redial"
+#~ msgstr "ਰੀ-ਡਾਇਲ"
+
+#~ msgid "V_ideo"
+#~ msgstr "ਵਿਡੀਓ(_i)"
+
+#~ msgid "Video Off"
+#~ msgstr "ਵਿਡੀਓ ਬੰਦ"
+
+#~ msgid "Video On"
+#~ msgstr "ਵਿਡੀਓ ਚਾਲੂ"
+
+#~ msgid "Video Preview"
+#~ msgstr "ਵਿਡੀਓ ਝਲਕ"
+
 #~ msgid "Find Next"
 #~ msgstr "ਅੱਗੇ ਲੱਭੋ"
 
@@ -4842,10 +5036,6 @@ msgstr "ਮਿਲਦਾ ਆਕਾਰ(_M)"
 #~ msgid "Hidden"
 #~ msgstr "ਓਹਲੇ"
 
-#~| msgid "%s has disconnected"
-#~ msgid "User requested disconnect"
-#~ msgstr "ਯੂਜ਼ਰ ਨੇ ਡਿਸ-ਕੁਨੈਕਟ ਹੋਣ ਦੀ ਮੰਗ ਕੀਤੀ"
-
 #~ msgid "Show the accounts dialog"
 #~ msgstr "ਅਕਾਊਂਟ ਡਾਈਲਾਗ ਵੇਖੋ"
 
diff --git a/po/pl.po b/po/pl.po
index 43a68a881..cb6755d7a 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-14 19:52+0200\n"
-"PO-Revision-Date: 2011-10-14 19:53+0200\n"
+"POT-Creation-Date: 2012-03-13 15:36+0100\n"
+"PO-Revision-Date: 2012-03-13 13:37+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@@ -22,518 +22,573 @@ msgstr ""
 "X-Poedit-Country: Poland\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Rozmawianie przez Google Talk, Facebook, MSN i wiele innych usług"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Komunikator"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Komunikator Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Komunikator"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Rozmawianie przez Google Talk, Facebook, MSN i wiele innych usług"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Konta komunikatora i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Zarządzanie kontami komunikatora i VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Zawsze otwiera oddzielne okna dla nowych rozmów."
+msgid "Connection managers should be used"
+msgstr "Użycie menedżerów połączeń"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Głośność rozmowy"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Określa, czy menedżery łączności powinny być używane do automatycznego "
+"rozłączenia/ponownego połączenia."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Głośność rozmowy w procentach."
+msgid "Empathy should auto-connect on startup"
+msgstr "Automatyczne łączenie się podczas uruchamiania"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Urządzenie kamery"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Pozycja kamery"
+msgid "Empathy should auto-away when idle"
+msgstr "Automatyczne ustawienie nieobecności podczas bezczynności"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Znak do dodania po automatycznym uzupełnieniu pseudonimu (klawiszem Tab) "
-"podczas rozmowy grupowej."
+"Określa, czy automatycznie przechodzić do trybu nieobecności podczas "
+"bezczynności."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Motyw okna rozmowy"
+msgid "Empathy default download folder"
+msgstr "Domyślny katalog pobierania programu Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Wariant motywu okna rozmowy"
+msgid "The default folder to save file transfers in."
+msgstr "Domyślny katalog zapisu przesyłanych plików."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Oddzielana przecinkami lista języków do sprawdzania pisowni (np. \"en, fr, pl"
-"\")."
+"Magiczny numer używany do sprawdzania, czy należy wykonać zadania czyszczenia"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Zmniejszona lista kontaktów"
+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."
+msgstr ""
+"Kod w empathy-sanity-cleaning.c używa tego numeru do sprawdzania, czy należy "
+"wykonać zadania czyszczenia. Użytkownicy nie powinni ręcznie zmieniać tego "
+"klucza."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Użycie menedżerów połączeń"
+msgid "Show offline contacts"
+msgstr "Wyświetlanie kontaktów w trybie offline"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kryterium porządkowania listy kontaktów"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Określa, czy wyświetlać na liście kontakty w trybie offline."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Domyślne urządzenie kamery do użycia w wideorozmowach, np. /dev/video0."
+msgid "Show avatars"
+msgstr "Wyświetlanie awatarów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Domyślny katalog, z którego są wybierane awatary"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Określa, czy wyświetlać awatary dla kontaktów na liście i oknach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Wyłączenie wyskakujących powiadomień podczas nieobecności"
+msgid "Show protocols"
+msgstr "Wyświetlanie protokołów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Wyłączenie dźwięków podczas nieobecności"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Określa, czy wyświetlać protokoły dla kontaktów na liście."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Wyświetlanie zdarzeń przychodzących w obszarze stanu"
+msgid "Show Balance in contact list"
+msgstr "Wyświetlanie salda na liście kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Wyświetlanie zdarzeń przychodzących w obszarze stanu. Jeśli zaznaczone, to "
-"będą natychmiast prezentowane użytkownikowi."
+msgid "Whether to show account balances in the contact list."
+msgstr "Określa, czy wyświetlać saldo kont na liście kontaktów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Obsługa usuwania echa"
+msgid "Compact contact list"
+msgstr "Zmniejszona lista kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Publikowanie położenia użytkownika"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Określa, czy wyświetlać listę kontaktów w trybie zmniejszonym."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Używanie urządzenia GPS do odnajdowania położenia"
+msgid "Hide main window"
+msgstr "Ukrycie głównego okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Używanie sieci komórkowej do odnajdowania położenia"
+msgid "Hide the main window."
+msgstr "Ukrycie głównego okna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Używanie sieci do odnajdowania położenia"
+msgid "Default directory to select an avatar image from"
+msgstr "Domyślny katalog, z którego są wybierane awatary"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Domyślny katalog pobierania programu Empathy"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Ostatni katalog, z którego był wybierany awatar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Przeprowadzono migrację dzienników butterfly"
+msgid "Open new chats in separate windows"
+msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Automatyczne ustawienie nieobecności podczas bezczynności"
+msgid "Always open a separate chat window for new chats."
+msgstr "Zawsze otwiera oddzielne okna dla nowych rozmów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Automatyczne łączenie się podczas uruchamiania"
+msgid "Display incoming events in the status area"
+msgstr "Wyświetlanie zdarzeń przychodzących w obszarze stanu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Zmniejszenie dokładności położenia"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Wyświetlanie zdarzeń przychodzących w obszarze stanu. Jeśli zaznaczone, to "
+"będą natychmiast prezentowane użytkownikowi."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
+msgid "The position for the chat window side pane"
+msgstr "Położenie panelu bocznego okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Włączenie narzędzi programistycznych WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Przechowane położenie (w pikselach) panelu bocznego okna rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
+msgid "Show contact groups"
+msgstr "Wyświetlanie grup kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Włączenie sprawdzania pisowni"
+msgid "Whether to show groups in the contact list."
+msgstr "Określa, czy wyświetlać grupy na liście kontaktów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Ukrycie głównego okna"
+msgid "Contact list sort criterion"
+msgstr "Kryterium porządkowania listy kontaktów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Ukrycie głównego okna."
+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 ""
+"Określa, jakie kryterium używać podczas porządkowania listy kontaktów. "
+"Domyślnie porządkowane jest według stanu kontaktów za pomocą wartości \"state"
+"\". Wartość \"name\" spowoduje porządkowanie według nazw kontaktów."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Znak do dodania po uzupełnieniu pseudonimu"
+msgid "Use notification sounds"
+msgstr "Używanie dźwięków powiadomień"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Otwieranie nowych rozmów w oddzielnych oknach"
+msgid "Whether to play a sound to notify of events."
+msgstr "Określa, czy odtwarzać dźwięk powiadamiający o zdarzeniach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Ścieżka używanego motywu Adium"
+msgid "Disable sounds when away"
+msgstr "Wyłączenie dźwięków podczas nieobecności"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid "Whether to play sound notifications when away or busy."
 msgstr ""
-"Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
-"Adium."
+"Określa, czy odtwarzać dźwięki powiadomień podczas nieobecności lub "
+"zajętości."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Odtworzenie dźwięku dla nadchodzących wiadomości"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Odtworzenie dźwięku dla nowych rozmów"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o nadchodzących wiadomościach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Odtworzenie dźwięku dla wychodzącej wiadomości"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o wychodzących wiadomościach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
+msgid "Play a sound for new conversations"
+msgstr "Odtworzenie dźwięku dla nowych rozmów"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Określa, czy odtwarzać dźwięk powiadamiający o nowych rozmowach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
+msgid "Play a sound when a contact logs in"
+msgstr "Odtworzenie dźwięku, kiedy kontakt się zaloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o zalogowaniu kontaktów do "
+"sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Wyskakujące powiadomienia, kiedy kontakt się zaloguje"
+msgid "Play a sound when a contact logs out"
+msgstr "Odtworzenie dźwięku, kiedy kontakt się wyloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Wyskakujące powiadomienia, kiedy kontakt się wyloguje"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Określa, czy odtwarzać dźwięk powiadamiający o wylogowaniu kontaktów z sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Położenie podglądu kamery podczas rozmowy."
+msgid "Play a sound when we log in"
+msgstr "Odtworzenie dźwięku, kiedy użytkownik się zaloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Wyświetlanie salda na liście kontaktów"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Określa, czy odtwarzać dźwięk podczas zalogowania do sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Wyświetlanie awatarów"
+msgid "Play a sound when we log out"
+msgstr "Odtworzenie dźwięku, kiedy użytkownik się wyloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Wyświetlanie listy kontaktów w pokojach"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Określa, czy odtwarzać dźwięk podczas wylogowania z sieci."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Wyświetlanie podpowiedzi o zamknięciu głównego okna"
+msgid "Enable popup notifications for new messages"
+msgstr "Włączenie wyskakujących powiadomień dla nowych wiadomości"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Wyświetlanie kontaktów w trybie offline"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
+"wiadomości."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Wyświetlanie protokołów"
+msgid "Disable popup notifications when away"
+msgstr "Wyłączenie wyskakujących powiadomień podczas nieobecności"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Języki sprawdzania pisowni"
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia podczas nieobecności lub "
+"zajętości."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Domyślny katalog zapisu przesyłanych plików."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Wyskakujące powiadomienia, jeśli okno rozmowy nie jest aktywne"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Ostatni katalog, z którego był wybierany awatar."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
+"wiadomości, nawet jeśli okno rozmowy jest już otwarte, lecz nie jest aktywne."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Położenie panelu bocznego okna rozmowy"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Wyskakujące powiadomienia, kiedy kontakt się zaloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Przechowane położenie (w pikselach) panelu bocznego okna rozmowy."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
+"do trybu online."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Motyw używany do wyświetlania rozmowy w oknach rozmowy."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Wyskakujące powiadomienia, kiedy kontakt się wyloguje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Wariant motywu używany do wyświetlania rozmowy w oknach rozmowy."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
+"do trybu offline."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Używanie graficznych emotikon"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Używanie dźwięków powiadomień"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr ""
+"Określa, czy przekształcać emotikony w rozmowach do postaci graficznej."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Używanie motywu dla pokoi rozmowy"
+msgid "Show contact list in rooms"
+msgstr "Wyświetlanie listy kontaktów w pokojach"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Określa, czy publikować położenie użytkownika jego kontaktom."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Określa, czy wyświetlać listę kontaktów w pokojach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Określa, czy używać urządzenia GPS do odnajdowania położenia."
+msgid "Chat window theme"
+msgstr "Motyw okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Określa, czy używać sieci komórkowej do odnajdowania położenia."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Motyw używany do wyświetlania rozmowy w oknach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Określa, czy używać sieci do odnajdowania położenia."
+msgid "Chat window theme variant"
+msgstr "Wariant motywu okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Określa, czy przeprowadzono migrację dzienników butterfly."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Wariant motywu używany do wyświetlania rozmowy w oknach rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Określa, czy automatycznie logować się do kont podczas uruchamiania."
+msgid "Path of the Adium theme to use"
+msgstr "Ścieżka używanego motywu Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Określa, czy automatycznie przechodzić do trybu nieobecności podczas "
-"bezczynności."
+"Ścieżka używanego motywu Adium, jeśli dla pokoju rozmowy używany jest motyw "
+"Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
+msgid "Enable WebKit Developer Tools"
+msgstr "Włączenie narzędzi programistycznych WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Określa, czy włączyć narzędzia programistyczne WebKit, takie jak Web "
 "Inspector."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informowanie innych użytkowników o pisaniu"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Określa, czy menedżery łączności powinny być używane do automatycznego "
-"rozłączenia/ponownego połączenia."
+"Określa, czy wysyłać stany rozmowy \"pisanie\" lub \"wstrzymano\". Obecnie "
+"nie wpływa na stan \"nieobecny\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Określa, czy sprawdzać słowa wprowadzane w podanych językach."
+msgid "Use theme for chat rooms"
+msgstr "Używanie motywu dla pokoi rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr ""
-"Określa, czy przekształcać emotikony w rozmowach do postaci graficznej."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Określa, czy używać motywów dla pokoi rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Określa, czy włączyć filtr usuwania echa usługi PulseAudio."
+msgid "Spell checking languages"
+msgstr "Języki sprawdzania pisowni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o zalogowaniu kontaktów do "
-"sieci."
+"Oddzielana przecinkami lista języków do sprawdzania pisowni (np. \"en, fr, pl"
+"\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o wylogowaniu kontaktów z sieci."
+msgid "Enable spell checker"
+msgstr "Włączenie sprawdzania pisowni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Określa, czy odtwarzać dźwięk powiadamiający o zdarzeniach."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Określa, czy sprawdzać słowa wprowadzane w podanych językach."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o nadchodzących wiadomościach."
+msgid "Nick completed character"
+msgstr "Znak do dodania po uzupełnieniu pseudonimu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Określa, czy odtwarzać dźwięk powiadamiający o nowych rozmowach."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak do dodania po automatycznym uzupełnieniu pseudonimu (klawiszem Tab) "
+"podczas rozmowy grupowej."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr ""
-"Określa, czy odtwarzać dźwięk powiadamiający o wychodzących wiadomościach."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Używanie awatarów kontaktów jako ikony okna rozmowy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Określa, czy odtwarzać dźwięk podczas zalogowania do sieci."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Określa, czy używać awatarów kontaktów jako ikony okna rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Określa, czy odtwarzać dźwięk podczas wylogowania z sieci."
+msgid "Last account selected in Join Room dialog"
+msgstr "Ostatnie konto wybrane w oknie Dołącz do pokoju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"Określa, czy odtwarzać dźwięki powiadomień podczas nieobecności lub "
-"zajętości."
+"Ścieżka do obiektu D-Bus ostatnio wybranego konta do dołączenia do pokoju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
-"do trybu offline."
+msgid "Camera device"
+msgstr "Urządzenie kamery"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia, kiedy kontakt przechodzi "
-"do trybu online."
+"Domyślne urządzenie kamery do użycia w wideorozmowach, np. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
-"wiadomości, nawet jeśli okno rozmowy jest już otwarte, lecz nie jest aktywne."
+msgid "Camera position"
+msgstr "Pozycja kamery"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia podczas otrzymania nowej "
-"wiadomości."
+msgid "Position the camera preview should be during a call."
+msgstr "Położenie podglądu kamery podczas rozmowy."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Określa, czy wyświetlać saldo kont na liście kontaktów."
+msgid "Echo cancellation support"
+msgstr "Obsługa usuwania echa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Określa, czy wyświetlać awatary dla kontaktów na liście i oknach rozmowy."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Określa, czy włączyć filtr usuwania echa usługi PulseAudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Określa, czy wyświetlać na liście kontakty w trybie offline."
+msgid "Show hint about closing the main window"
+msgstr "Wyświetlanie podpowiedzi o zamknięciu głównego okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Określa, czy wyświetlać wyskakujące powiadomienia podczas nieobecności lub "
-"zajętości."
+"Określa, czy wyświetlać okno dialogowe podczas zamykania głównego okna "
+"przyciskiem \"x\" na pasku tytułowym."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Określa, czy wyświetlać protokoły dla kontaktów na liście."
+msgid "Empathy can publish the user's location"
+msgstr "Publikowanie położenia użytkownika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Określa, czy wyświetlać listę kontaktów w pokojach rozmowy."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Określa, czy publikować położenie użytkownika jego kontaktom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Określa, czy wyświetlać listę kontaktów w trybie zmniejszonym."
+msgid "Empathy can use the network to guess the location"
+msgstr "Używanie sieci do odnajdowania położenia"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Określa, czy wyświetlać okno dialogowe podczas zamykania głównego okna "
-"przyciskiem \"x\" na pasku tytułowym."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Określa, czy używać sieci do odnajdowania położenia."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Określa, czy używać motywów dla pokoi rozmowy."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Używanie sieci komórkowej do odnajdowania położenia"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Określa, czy używać sieci komórkowej do odnajdowania położenia."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Używanie urządzenia GPS do odnajdowania położenia"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Określa, czy używać urządzenia GPS do odnajdowania położenia."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Zmniejszenie dokładności położenia"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Określa, jakie kryterium używać podczas porządkowania listy kontaktów. "
-"Domyślnie porządkowane jest według nazwy kontaktów za pomocą wartości \"name"
-"\". Wartość \"state\" spowoduje porządkowanie według stanu kontaktu."
+"Określa, czy zmniejszać dokładność położenia w celu ochrony prywatności."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Zarządzanie kontami komunikatora i VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nie podano powodu"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Konta komunikatora i VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Zażądano zmiany stanu"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Przesłanie pliku zostało anulowane przez użytkownika"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Przesłanie pliku zostało anulowane przez drugą stronę"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Błąd podczas próby przesłania pliku"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Druga strona nie może odebrać pliku"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nieznany powód"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Ukończono przesyłanie pliku, ale plik jest uszkodzony"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Przesyłanie plików nie jest obsługiwane przez zdalnego użytkownika"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Wybrany plik nie jest zwykłym plikiem"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Wybrany plik jest pusty"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Nieodebrana rozmowa głosowa od użytkownika %s"
@@ -549,171 +604,140 @@ msgstr "Rozmowa głosowa z użytkownikiem %s"
 msgid "Call from %s"
 msgstr "Rozmowa głosowa od użytkownika %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Typ gniazda nie jest obsługiwany"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nie podano powodu"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Zażądano zmiany stanu"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Przesłanie pliku zostało anulowane przez użytkownika"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Przesłanie pliku zostało anulowane przez drugą stronę"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Błąd podczas próby przesłania pliku"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strona nie może odebrać pliku"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nieznany powód"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Nieobecny"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Offline"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nie podano powodu"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stan został zmieniony na offline"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Błąd sieci"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Uwierzytelnienie się nie powiodło"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Błąd szyfrowania"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Pseudonim jest już używany"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Nie dostarczono certyfikatu"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Niezaufany certyfikat"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certyfikat wygasł"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certyfikat nieaktywny"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Nazwa komputera w certyfikacie nie zgadza się"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Odcisk palca certyfikatu nie zgadza się"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certyfikat został samodzielnie podpisany"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Błąd certyfikatu"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Szyfrowanie nie jest dostępne"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certyfikat jest nieprawidłowy"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Połączenie zostało odrzucone"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Nie można ustanowić połączenia"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Połączenie zostało utracone"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ten zasób jest już połączony z serwerem"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "To konto jest już połączone z serwerem"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "Połączenie zostało zastąpione nowym połączeniem używając tego samego zasobu"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Konto już istnieje na serwerze"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Serwer jest obecnie zbyt zajęty, aby obsłużyć połączenie"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certyfikat został unieważniony"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Certyfikat używa niebezpiecznego algorytmu szyfrowania lub jest "
 "kryptograficznie słaby"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -721,24 +745,31 @@ msgstr ""
 "Długość certyfikatu serwera lub głębokość łańcucha certyfikatu serwera "
 "przekracza ograniczenie wymuszane przez bibliotekę kryptograficzną"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Oprogramowanie jest za stare"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Wewnętrzny błąd"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Osoby w pobliżu"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japonia"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook Chat"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -746,7 +777,7 @@ msgstr[0] "%d sekundę temu"
 msgstr[1] "%d sekundy temu"
 msgstr[2] "%d sekund temu"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -754,7 +785,7 @@ msgstr[0] "%d minutę temu"
 msgstr[1] "%d minuty temu"
 msgstr[2] "%d minut temu"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +793,7 @@ msgstr[0] "%d godzinę temu"
 msgstr[1] "%d godziny temu"
 msgstr[2] "%d godzin temu"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -770,7 +801,7 @@ msgstr[0] "%d dzień temu"
 msgstr[1] "%d dni temu"
 msgstr[2] "%d dni temu"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -778,7 +809,7 @@ msgstr[0] "%d tydzień temu"
 msgstr[1] "%d tygodnie temu"
 msgstr[2] "%d tygodni temu"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -786,224 +817,210 @@ msgstr[0] "%d miesiąc temu"
 msgstr[1] "%d miesiące temu"
 msgstr[2] "%d miesięcy emu"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "w przyszłości"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Nie odnaleziono hasła"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Hasło konta komunikatora dla %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Hasło dla pokoju rozmowy \"%s\" na koncie %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Wszystkie konta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Hasło"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Serwer"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Moje konta internetowe"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1209
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Konto %s jest modyfikowane przez %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1215
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Konta %s nie można modyfikować w programie Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1234
-msgid "Launch My Web Accounts"
-msgstr "Uruchom Moje konta internetowe"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1242
-#, c-format
-msgid "Edit %s"
-msgstr "Modyfikuj %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1592
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1910
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "Za_stosuj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
-msgstr "Zal_oguj się"
+msgstr "Zal_oguj"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2014
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "To konto już istnieje na serwerze"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2017
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Utworzenie nowego konta na serwerze"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2209
-msgid "Ca_ncel"
-msgstr "A_nuluj"
-
 #. 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:2487
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %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:2513
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Konto %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2517
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nowe konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Przykład:</b> MojaNazwaUżytkownika"
+#: ../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:"
+msgstr "_Hasło:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Zaawansowane"
+msgid "Screen _Name:"
+msgstr "_Nazwa użytkownika:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Przykład:</b> MojaNazwaUżytkownika"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Hasło:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapamiętywanie hasła"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapamiętaj hasło"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Zapamiętywanie hasła"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nazwa użytkownika:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Serwer:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Hasło AIM:"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Zaawansowane"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Nazwa użytkownika AIM:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Hasło AIM:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Serwer:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Przykład:</b> nazwa_użytkownika"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapamiętaj hasło"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Id_entyfikator logowania:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Przykład:</b> nazwa_użytkownika"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Identyfikator użytkownika GroupWise:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Hasło GroupWise:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "_UIN ICQ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Przykład:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Zest_aw znaków:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "_UIN ICQ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "UIN ICQ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Hasło ICQ:"
 
@@ -1040,11 +1057,23 @@ msgstr "Opcje"
 msgid "None"
 msgstr "Brak"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Sieć"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Sieć:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Zestaw znaków:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serwery"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1052,14 +1081,6 @@ msgstr ""
 "Większość serwerów IRC nie wymaga hasła, więc w razie niepewności nie należy "
 "go podawać."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Sieć"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Sieć:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Pseudonim:"
@@ -1076,48 +1097,20 @@ msgstr "Komunikat podczas zakończenia:"
 msgid "Real name:"
 msgstr "Imię i nazwisko:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serwery"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Pseudonim IRC:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Sieć IRC:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Przykład:</b> użytkownik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Przykład:</b> użytkownik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Wymagane szyfrowanie (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "Ig_norowanie błędów certyfikatu SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Zastępuje ustawienia serwera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_orytet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Pseudonim IRC:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Zasób:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Nazwa użytkownika serwisu Facebook:"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1130,179 +1123,203 @@ msgstr ""
 "aby wybrać nazwę użytkownika serwisu Facebook, jeśli jeszcze jej nie "
 "ustawiono."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Stare szyfrowanie SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Hasło serwisu Facebook:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Nazwa użytkownika serwisu Facebook:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Identyfikator Google:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Przykład:</b> użytkownik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Hasło Google:"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Przykład:</b> użytkownik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "Ig_norowanie błędów certyfikatu SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_orytet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Zasób:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Wymagane szyfrowanie (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Stare szyfrowanie SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Zastępuje ustawienia serwera"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Identyfikator Jabbera:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Hasło Jabbera:"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Żądany identyfikator Jabbera:"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Hasło Jabbera:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Żądane hasło Jabbera:"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Przykład:</b> użytkownik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Identyfikator Windows Live:"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Hasło Windows Live:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Adres _e-mail:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Pseu_donim:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "Na_zwisko:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "I_mię:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nazwa _opublikowana:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Identyfikator Ja_bbera:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "Na_zwisko:"
+msgid "E-_mail address:"
+msgstr "Adres _e-mail:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nazwa _opublikowana:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "Nazwa _użytkownika:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Przykład:</b> użytkownik@mój.serwer.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Nazwa użytkownika uwierzytelnienia:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Wykrywanie dowiązywania"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Automatyczne wykrywanie serwera STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Użycie tego konta do połączeń na telefony _stacjonarne i komórkowe"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorowanie błędów TLS"
+msgid "NAT Traversal Options"
+msgstr "Opcje przechodzenia NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Czas między aktualizacjami (w sekundach)"
+msgid "Proxy Options"
+msgstr "Opcje pośrednika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcje \"Keep-Alive\""
+msgid "Miscellaneous Options"
+msgstr "Różne opcje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Swobodne trasowanie"
+msgid "STUN Server:"
+msgstr "Serwer STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mechanizm:"
+msgid "Discover the STUN server automatically"
+msgstr "Automatyczne wykrywanie serwera STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Różne opcje"
+msgid "Discover Binding"
+msgstr "Wykrywanie dowiązywania"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcje przechodzenia NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Serwer"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcje \"Keep-Alive\""
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mechanizm:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcje pośrednika"
+msgid "Interval (seconds)"
+msgstr "Czas między aktualizacjami (w sekundach)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Nazwa użytkownika uwierzytelnienia:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Serwer STUN:"
+msgid "Loose Routing"
+msgstr "Swobodne trasowanie"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Serwer"
+msgid "Ignore TLS Errors"
+msgstr "Ignorowanie błędów TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Użycie tego konta do połączeń na telefony _stacjonarne i komórkowe"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Hasło konta SIP:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Identyfikator loginu SIP:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "Nazwa _użytkownika:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Hasło konta SIP:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Id_entyfikator Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "Ig_norowanie zaproszeń konferencyjnych i pokoi rozmowy"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Ustawienia językowe listy pokoi:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Identyfikator Yahoo!:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Hasło Yahoo!:"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Id_entyfikator Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Ustawienia językowe listy pokoi:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1341,61 +1358,65 @@ msgstr "Wszystkie pliki"
 msgid "Click to enlarge"
 msgstr "Kliknięcie powiększy"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Wystąpił błąd podczas rozpoczynania rozmowy głosowej"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Podany kontakt nie obsługuje rozmów głosowych"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Wybrany kontakt jest w trybie offline"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Wybrany kontakt nie jest prawidłowy"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Rozmowy alarmowe nie są obsługiwane przez ten protokół"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Brak wystarczających środków, aby zadzwonić"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Otwarcie prywatnej rozmowy się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Temat nie jest obsługiwany w czasie tej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:768
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Brak uprawnienia do zmiany tematu"
 
-#: ../libempathy-gtk/empathy-chat.c:969
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "\"%s\" nie jest prawidłowym identyfikatorem kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1054
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: usuwa wszystkie wiadomości z bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <temat>: ustawia temat bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <identyfikator pokoju rozmów>: dołącza do nowego pokoju rozmów"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1403,24 +1424,24 @@ msgstr ""
 "/part [<identyfikator pokoju rozmów>] [<przyczyna>]: opuszcza pokój rozmów, "
 "domyślnie bieżący"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr ""
 "/query <identyfikator kontaktu> [<wiadomość>]: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <identyfikator kontaktu> <wiadomość>: otwiera prywatną rozmowę"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <pseudonim>: zmienia pseudonim na bieżącym serwerze"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <wiadomość>: wysyła wiadomość DZIAŁANIA do bieżącej rozmowy"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1430,11 +1451,11 @@ msgstr ""
 "wysyłania wiadomości zaczynającej się od znaku \"/\". Na przykład: \"/say /"
 "join jest używane do dołączenia do nowego pokoju rozmowy\""
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <identyfikator kontaktu>: wyświetla informacje o kontakcie"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1442,113 +1463,127 @@ msgstr ""
 "/help [<polecenie>]: wyświetla wszystkie obsługiwane polecenia. Jeśli podano "
 "<polecenie>, zostanie wyświetlone jej użycie."
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Użycie: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1153
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
-#: ../libempathy-gtk/empathy-chat.c:1279
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nieznane polecenie. opcja /help wyświetli dostępne polecenia"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1449
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "niewystarczające saldo, aby wysłać wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1451
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Błąd podczas wysyłania wiadomości: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+"niewystarczające saldo, aby wysłać wiadomość. <a href='%s'>Doładuj</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "brak możliwości"
 
-#: ../libempathy-gtk/empathy-chat.c:1458
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "offline"
 
-#: ../libempathy-gtk/empathy-chat.c:1461
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "nieprawidłowy kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "brak dostępu"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "za długa wiadomość"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "niezaimplementowane"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Błąd podczas wysyłania wiadomości \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Błąd podczas wysyłania wiadomości: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1541 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Temat:"
 
-#: ../libempathy-gtk/empathy-chat.c:1553
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Temat ustawiony na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1555
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Temat ustawiony przez użytkownika %s na: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Temat nie został określony"
 
-#: ../libempathy-gtk/empathy-chat.c:2068
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(brak podpowiedzi)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2136
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj \"%s\" do słownika"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2173
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj \"%s\" do słownika %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Wstaw emotikonę"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2261
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Wyślij"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2315
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Podpowiedzi pi_sowni"
 
-#: ../libempathy-gtk/empathy-chat.c:2404
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Pobranie ostatnich dzienników się nie powiodło"
 
-#: ../libempathy-gtk/empathy-chat.c:2541
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "Użytkownik %s został rozłączony"
@@ -1556,12 +1591,12 @@ msgstr "Użytkownik %s został rozłączony"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2548
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "Użytkownik %1$s został wyrzucony przez użytkownika %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2551
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "Użytkownik %s został wyrzucony"
@@ -1569,17 +1604,17 @@ msgstr "Użytkownik %s został wyrzucony"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2559
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "Użytkownik %1$s został zablokowany przez użytkownika %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "Użytkownik %s został zablokowany"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "Użytkownik %s opuścił pokój"
@@ -1589,17 +1624,17 @@ msgstr "Użytkownik %s opuścił pokój"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2575
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2600
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "Użytkownik %s dołączył do pokoju"
 
-#: ../libempathy-gtk/empathy-chat.c:2625
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "Użytkownik %s jest teraz znany jako %s"
@@ -1607,90 +1642,90 @@ msgstr "Użytkownik %s jest teraz znany jako %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:2778
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3424
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Zachować hasło?"
 
-#: ../libempathy-gtk/empathy-chat.c:3430
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Zapamiętaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3440
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Nie teraz"
 
-#: ../libempathy-gtk/empathy-chat.c:3484
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Ponów"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Błędne hasło. Proszę spróbować ponownie:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3618
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ten pokój jest chroniony hasłem:"
 
-#: ../libempathy-gtk/empathy-chat.c:3645
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Dołącz"
 
-#: ../libempathy-gtk/empathy-chat.c:3833 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../libempathy-gtk/empathy-chat.c:3888
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Rozmowa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Nieznany lub nieprawidłowy identyfikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokowanie kontaktów jest tymczasowo niedostępne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Blokowanie kontaktów jest niedostępne"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Brak dostępu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Nie można zablokować kontaktu"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Modyfikacja zablokowanych kontaktów"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1700,62 +1735,53 @@ msgstr "Zablokowane kontakty"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Usuń"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "S_kopiuj adres odnośnika"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otwórz odnośnik"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Modyfikowanie informacji o kontakcie"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informacje osobiste"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Nowy kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Zablokować użytkownika %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "Na pewno zablokować użytkownika \"%s\"?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "Za_blokuj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "Zgł_oś ten kontakt jako obraźliwy"
@@ -1763,403 +1789,315 @@ msgstr[1] "Zgł_oś te kontakty jako obraźliwe"
 msgstr[2] "Zgł_oś te kontakty jako obraźliwe"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Z_decyduj później"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Prośba o upoważnienie"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "Za_blokuj użytkownika"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Nie w grupach"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Ulubione osoby"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Na pewno usunąć grupę \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Usuwanie grupy"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Usuń"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Na pewno usunąć kontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Usuwanie kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Dodaj kontakt…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "Za_blokuj kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Rozmowa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "Rozmow_a głosowa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Wideorozmowa"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Poprzednie rozmowy"
-
-# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Wyślij plik"
-
-# to jest w menu
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Współdziel pulpit"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1887
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Ulubione"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_macje"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Modyfikuj"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Zapraszanie do tego pokoju"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "_Zaproś do pokoju rozmowy"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Z_decyduj później"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Wyszukiwanie kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
-msgstr "Wyszukaj:"
+msgstr "Wyszukiwanie:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Dodaj kontakt"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nie odnaleziono kontaktów"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Wiadomość z powitaniem:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Daj znać, jak pojawisz się w sieci. Dzięki."
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Wybór kontaktu"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Imię i nazwisko:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Numer telefonu:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Adres e-mail:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Witryna WWW:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Urodziny:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Ostatnio widziany:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Połączony z:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Wiadomość podczas nieobecności:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanały:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Kod ISO kraju:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Stan/województwo:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Miasto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Obszar:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Budynek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Piętro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Adres URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Poziom dokładności:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Błąd:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Błąd w pionie (metry):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Błąd w poziomie (metry):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Prędkość:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Kierunek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Prędkość wznoszenia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Ostatnia aktualizacja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Długość geograficzna:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Szerokość geograficzna:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Wysokość n.p.m.:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Położenie"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e %B %Y o %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Zapisanie awatara"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Nie można zapisać awatara"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Położenie</b> w dniu\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Informacje o kliencie"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klient:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Szczegóły osobiste"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Szczegóły kontaktu"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Imię i nazwisko"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Numer telefonu"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Adres e-mail"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Witryna WWW"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Urodziny"
+
+#. 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 "Ostatnio widziany:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Połączony z:"
+
+#. 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 "Wiadomość podczas nieobecności:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "praca"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "dom"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "komórka"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "głosowa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "preferowane"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "pocztowy"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "paczka"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identyfikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Alias:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Położenie</b> w dniu\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Żądanie informacji…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Informacje o kliencie"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Wersja:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klient:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupy"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2167,107 +2105,181 @@ msgstr ""
 "Proszę wybrać grupy, w których ma się pojawić ten kontakt. Można wybrać "
 "więcej niż jedną grupę lub nie wybierać żadnej."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Dod_aj grupę"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Wybór"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Następująca osoba zostanie zablokowana:"
 msgstr[1] "Następujące osoby zostaną zablokowane:"
 msgstr[2] "Następujące osoby zostaną zablokowane:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Następująca osoba nie może zostać zablokowana:"
 msgstr[1] "Następujące osoby nie mogą zostać zablokowane:"
 msgstr[2] "Następujące osoby nie mogą zostać zablokowane:"
 
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Modyfikowanie informacji o kontakcie"
+
 #. Translators: the heading at the top of the Information dialogue
 #: ../libempathy-gtk/empathy-individual-information-dialog.c:288
 msgid "Linked Contacts"
 msgstr "Połączone kontakty"
 
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Wybór kontaktów do połączenia"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Podgląd nowego kontaktu"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakty zaznaczone na liście po lewej stronie zostaną połączone."
-
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:173
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:345
 msgid "Select account to use to place the call"
 msgstr "Wybór konta do umieszczenia tej rozmowy głosowej"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../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 "Rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:414
 msgid "Mobile"
 msgstr "Komórka"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 msgid "Work"
 msgstr "Praca"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "HOME"
 msgstr "Dom"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "Za_blokuj kontakt"
+
+#. 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
+msgid "_Chat"
+msgstr "_Rozmowa"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "Rozmow_a głosowa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Wideorozmowa"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Poprzednie rozmowy"
+
+# to jest w menu
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "Wyślij plik"
+
+# to jest w menu
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "Współdziel pulpit"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Ulubione"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+msgid "gnome-contacts not installed"
+msgstr "Pakiet gnome-contacts nie jest zainstalowany"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Proszę zainstalować pakiet gnome-contacts, aby uzyskać dostęp do szczegółów "
+"kontaktów."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "Infor_macje"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Połącz kontakty…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Zapraszanie do tego pokoju"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "_Zaproś do pokoju rozmowy"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Dodaj kontakt…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Usuń i za_blokuj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Na pewno usunąć grupę \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Usuwanie grupy"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Usuń"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Na pewno usunąć kontakt \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2276,7 +2288,11 @@ msgstr ""
 "Na pewno usunąć metakontakt \"%s\"? Wszystkie kontakty tworzące metakontakt "
 "zostaną usunięte."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Usuwanie kontaktu"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2288,23 +2304,23 @@ msgstr[2] "Metakontakt zawierający %u kontaktów"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Położenie</b> w (dniu)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Online z telefonu lub urządzenia przenośnego"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nowa sieć"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Wybór sieci IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Przywróć listę _sieci"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Wybierz"
@@ -2317,91 +2333,48 @@ msgstr "nowy serwer"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Połączenie kontaktów"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Rozłącz…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Całkowicie rozdziela wyświetlany metakontakt na tworzące go kontakty."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Połącz"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Rozłączyć metakontakt \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Na pewno rozłączyć ten metakontakt? Metakontakty zostaną całkowicie "
-"rozłączone na tworzące go kontakty."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Rozłącz"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Historia"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Wyświetlenie"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Wyszukiwanie"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Rozmowa w %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Rozmowa z użytkownikiem %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %e %B %Y, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2409,7 +2382,7 @@ msgstr[0] "%s sekunda"
 msgstr[1] "%s sekundy"
 msgstr[2] "%s sekund"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2417,150 +2390,196 @@ msgstr[0] "%s minuta"
 msgstr[1] "%s minuty"
 msgstr[2] "%s minut"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Rozmowa głosowa miała miejsce %s, została zakończona %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Zawsze"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Wszyscy"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kiedy"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Wszystko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Rozmowy tekstowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Przychodzące rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Wychodzące rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Nieodebrane rozmowy głosowe"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Co"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Na pewno usunąć wszystkie dzienniki poprzednich rozmów?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Wyczyść wszystko"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Usunięcie od:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Wczytywanie...</span>"
+msgid "_File"
+msgstr "_Plik"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Rozmowa"
+#: ../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 "_Edycja"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Usuń całą historię..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Wideo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Rozmowa"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Edycja"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Wideo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Plik"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "strona 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "Identyfikator kontaktu:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Wczytywanie...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakt jest w trybie offline"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "_Rozmowa"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Wybrany kontakt jest nieprawidłowy lub nieznany"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakt nie obsługuje tego rodzaju rozmowy"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Żądana funkcjonalność nie jest zaimplementowana dla tego protokołu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Nie można rozpocząć rozmowy z podanym kontaktem"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Użytkownik został zablokowany na tym kanale"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Ten kanał jest pełny"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Wymagane jest zaproszenie, aby dołączyć do tego kanału"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Nie można kontynuować podczas rozłączenia"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Odmowa dostępu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Wystąpił błąd podczas rozpoczynania rozmowy"
+
+#: ../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 "Proszę wpisać identyfikator lub numer telefonu kontaktu:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nowa rozmowa"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Wyślij obraz _wideo"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Wideorozmowa"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Rozmowa głosowa"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "Rozmow_a głosowa"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nowa rozmowa głosowa"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Uwierzytelnienie konta <b>%s</b> się nie powiodło"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2597,12 +2616,8 @@ msgstr "Kliknięcie doda ten stan do ulubionych"
 msgid "Set status"
 msgstr "Ustaw stan"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Ustawienie obecności i obecnego stanu"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Własne wiadomości…"
 
@@ -2610,7 +2625,7 @@ msgstr "Własne wiadomości…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nowe konto %s"
@@ -2620,20 +2635,20 @@ msgid "Find:"
 msgstr "Wyszukiwanie:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Rozróżnianie wielkości liter"
+msgid "_Previous"
+msgstr "_Poprzednie"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Nie odnaleziono napisu"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Następne"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Rozróżnianie wielkości liter"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Poprzednie"
+msgid "Phrase not found"
+msgstr "Nie odnaleziono napisu"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2679,12 +2694,12 @@ msgstr "Rozmowa głosowa zakończona"
 msgid "Edit Custom Messages"
 msgstr "Modyfikowanie własnej wiadomości"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Zmodyfikowano wiadomość o %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Zwykły"
 
@@ -2762,34 +2777,38 @@ msgid "Certificate hostname: %s"
 msgstr "Nazwa komputera w certyfikacie: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Kontynuuj"
+msgid "C_ontinue"
+msgstr "K_ontynuuj"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Niezaufane połączenie"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "To połączenie jest niezaufane. Kontynuować mimo to?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapamiętanie tego wyboru dla przyszłych połączeń"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Szczegóły certyfikatu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Nie można otworzyć adresu URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Wybór pliku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Brak wolnego miejsca, aby zapisać plik"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2798,7 +2817,7 @@ msgstr ""
 "Wymagane jest %s wolnego miejsca, aby zapisać ten plik, ale dostępne jest "
 "tylko %s. Proszę wybrać inne położenie."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Plik przychodzący od użytkownika %s"
@@ -2970,39 +2989,31 @@ msgstr "zachodnie"
 msgid "Vietnamese"
 msgstr "wietnamskie"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Wybrany kontakt nie może odbierać plików."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Wybrany kontakt jest w trybie offline."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Brak komunikatu błędu"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Wiadomość (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Bez łączenia podczas uruchamiania"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Bez wyświetlania listy kontaktów lub innych okien podczas uruchamiania"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
-msgstr " - komunikator Empathy"
+msgstr "- komunikator Empathy"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Błąd podczas nawiązywania połączenia z menedżerem kont"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3050,230 +3061,91 @@ msgstr ""
 "- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
 "Fifth Floor, Boston, MA 02110-130159 USA."
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Komunikator dla środowiska GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr "Aviary.pl <gnomepl@aviary.pl>, 2008, 2009, 2010, 2011"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Wystąpił błąd podczas importowania kont."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Wystąpił błąd podczas przetwarzania szczegółów konta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Wystąpił błąd podczas tworzenia konta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Wystąpił błąd."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Komunikat błędu: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Można wrócić i spróbować ponownie wprowadzić szczegóły konta lub zakończyć "
-"tego asystenta i dodać konta później z menu Edycja."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Wystąpił błąd"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Rodzaj posiadanego konta rozmów:"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Inne posiadane konta rozmów do ustawienia:"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Proszę wprowadzić szczegóły konta"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Rodzaj konta rozmów do utworzenia:"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Utworzyć inne konta rozmów?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Proszę wprowadzić szczegóły nowego konta"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Za pomocą programu Empathy można rozmawiać z ludźmi w sieci będącymi w "
-"pobliżu oraz przyjaciółmi i znajomymi, którzy używają Google Talk, AIM, "
-"Windows Live i wielu innych komunikatorów. Za pomocą mikrofonu lub kamery "
-"internetowej można także prowadzić rozmowy głosowe i wideokonferencje."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Czy konto było już używane za pomocą innego komunikatora?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Tak, zaimportuj szczegóły konta z "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Tak, wprowadzę teraz szczegóły konta"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Nie, chcę utworzyć nowe konto"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nie, chcę na razie widzieć tylko osoby w sieci będące w pobliżu"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Proszę wybrać konta do zaimportowania:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Tak"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Nie, to na razie wszytko"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Program Empathy może automatycznie wykrywać i umożliwiać rozmowę z osobami "
-"połączonymi do tej samej sieci. Aby używać tej funkcji, proszę sprawdzić, "
-"czy poniższe dane są poprawne. Można je łatwo zmienić w późniejszym czasie "
-"lub wyłączyć tę funkcję używając okna \"Konta\""
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Edycja->Konta"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_Nie chcę na razie włączać tej funkcji"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Nie będzie można rozmawiać z osobami połączonymi do lokalnej sieci, jeśli "
-"pakiet telepathy-salut nie zostanie zainstalowany. Aby włączyć tę funkcję, "
-"proszę zainstalować pakiet telepathy-salut i utworzyć konto \"Osoby w pobliżu"
-"\" z okna Konta"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "Pakiet telepathy-salut nie jest zainstalowany"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asystent kont komunikatora i VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Witamy w programie Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importowanie istniejących kont"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Proszę wprowadzić dane osobiste"
+msgstr "Aviary.pl <gnomepl@aviary.pl>, 2008, 2009, 2010, 2011, 2012"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Modyfikacje konta %s nie zostały zapisane."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Nowe konto nie zostało jeszcze zapisane."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Łączenie…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Offline — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Rozłączony — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Offline — brak połączenia z siecią"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nieznany stan"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"To konto zostało wyłączone, ponieważ używa ono starego, nieobsługiwanego "
+"mechanizmu. Proszę zainstalować pakiet telepathy-haze i ponownie uruchomić "
+"sesję, aby migrować konto."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Offline — konto jest wyłączone"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Za chwilę nastąpi utworzenie nowego konta, co\n"
-"spowoduje utratę zmian. Na pewno kontynuować?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Modyfikacja parametrów połączenia"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Pobranie informacji osobistych z serwera się nie powiodło."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Proszę przejść do trybu online, aby modyfikować informacje osobiste."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Modyfikuj parametry połączenia..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Na pewno usunąć \"%s\" z komputera?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Nie usunie to konta na serwerze."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3282,15 +3154,23 @@ msgstr ""
 "utratę zmian. Na pewno kontynuować?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Włączone"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "Wyłą_czone"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Pomiń"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "P_ołącz"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3302,19 +3182,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Wczytywanie informacji o koncie"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Brak zainstalowanych protokołów"
+msgid "_Import…"
+msgstr "_Zaimportuj…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokół:"
+msgid "Loading account information"
+msgstr "Wczytywanie informacji o koncie"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3322,132 +3198,116 @@ msgstr ""
 "Aby dodać nowe konto należy najpierw zainstalować moduł obsługi dla każdego "
 "wymaganego protokołu."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Zaimportuj…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Brak zainstalowanych mechanizmów protokołów"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " - klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Klient uwierzytelniania komunikatora Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Osoby w pobliżu"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Klient dźwięku/wideo komunikatora Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Jasność"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Głośność"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Panel"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Wejście dźwięku"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Wejście obrazu"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Panel wybierania"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Szczegóły"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Rozmowa głosowa z użytkownikiem %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Adres IP widziany przez komputer"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Adres IP widziany przez serwer w Internecie"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Adres IP elementu widziany przez drugą stronę"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Adres IP serwera odpowiedzi"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Adres IP grupy multikastowej"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nieznany"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nieznany"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nieznany"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Połączony — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Szczegóły techniczne"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3456,8 +3316,8 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu dźwięku "
 "używanego przez ten komputer"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3466,8 +3326,8 @@ msgstr ""
 "Oprogramowanie użytkownika %s nie obsługuje żadnego formatu wideo używanego "
 "przez ten komputer"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3476,27 +3336,27 @@ msgstr ""
 "Nie można nawiązać połączenia z użytkownikiem %s. Jeden z uczestników może "
 "się znajdować w sieci, która nie pozwala na bezpośrednie połączenia."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Wystąpił błąd sieci"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Formaty dźwięku wymagane dla tej rozmowy nie są zainstalowane na komputerze"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Formaty wideo wymagane dla tej rozmowy nie są zainstalowane na komputerze"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3507,161 +3367,213 @@ msgstr ""
 "\">zgłosić ten błąd</a> i dołączyć dzienniki uzyskane z okna \"Debugowanie\" "
 "w menu Pomoc."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Wystąpił błąd mechanizmu rozmowy"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Osiągnięto koniec strumienia"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Nie można utworzyć strumienia dźwięku"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Nie można utworzyć strumienia obrazu"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Dźwięk"
+msgid "_Call"
+msgstr "_Zadzwoń"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Dekoder:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Wyłącz kamerę"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Wyświetl panel wybierania"
+msgid "_Settings"
+msgstr "_Ustawienia"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Koder:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Widok"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Rozłącz"
+#: ../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 "Pomo_c"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Rozłącza bieżącą rozmowę"
+#: ../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 "_Spis treści"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalny kandydat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Debugowanie"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Zmaksymalizuj"
+msgid "Swap camera"
+msgstr "Przełącz kamery"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Zminimalizuj"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Zdalny kandydat:"
+msgid "Maximise me"
+msgstr "Zmaksymalizuj"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Wyślij dźwięk"
+msgid "Disable camera"
+msgstr "Wyłącz kamerę"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Wyślij obraz wideo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Rozłącz"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Wyświetl panel wybierania"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Rozłącza bieżącą rozmowę"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Wideorozmowa"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Rozpocznij wideorozmowę"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Rozpocznij rozmowę głosową"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Przełącz kamery"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Przełącza przesyłanie dźwięku"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Przełącza przesyłanie obrazu wideo"
+msgid "Show dialpad"
+msgstr "Wyświetl panel wybierania"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nieznany"
+msgid "Display the dialpad"
+msgstr "Wyświetl panel wybierania"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Wyślij obraz wideo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Wideorozmowa"
+msgid "Toggle video transmission"
+msgstr "Przełącza przesyłanie obrazu wideo"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Zadzwoń"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Wyślij dźwięk"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Spis treści"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Przełącza przesyłanie dźwięku"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Debugowanie"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Koder:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Pomo_c"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Dekoder:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Zdalny kandydat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Ustawienia"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokalny kandydat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Widok"
+msgid "Audio"
+msgstr "Dźwięk"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Zamknąć to okno?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Zamknięcie tego okna spowoduje opuszczenie pokoju %s. Wiadomości nie będą "
+"odbierane aż do ponownego dołączenia."
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Zamknięcie tego okna spowoduje opuszczenie pokoju rozmów. Wiadomości nie "
+"będą odbierane aż do ponownego dołączenia."
+msgstr[1] ""
+"Zamknięcie tego okna spowoduje opuszczenie %u pokojów rozmów. Wiadomości nie "
+"będą odbierane aż do ponownego dołączenia."
+msgstr[2] ""
+"Zamknięcie tego okna spowoduje opuszczenie %u pokojów rozmów. Wiadomości nie "
+"będą odbierane aż do ponownego dołączenia."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Opuścić %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Wiadomości z tego pokoju rozmów nie będą odbierane aż do ponownego "
+"dołączenia."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Zamknij okno"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Opuść pokój"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3669,7 +3581,7 @@ msgstr[0] "%s (%d nieprzeczytana)"
 msgstr[1] "%s (%d nieprzeczytane)"
 msgstr[2] "%s (%d nieprzeczytanych)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3677,7 +3589,7 @@ msgstr[0] "%s (i %u inna)"
 msgstr[1] "%s (i %u inne)"
 msgstr[2] "%s (i %u innych)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3685,7 +3597,7 @@ msgstr[0] "%s (%d nieprzeczytana od innych)"
 msgstr[1] "%s (%d nieprzeczytane od innych)"
 msgstr[2] "%s (%d nieprzeczytanych od innych)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3693,11 +3605,11 @@ msgstr[0] "%s (%d nieprzeczytana od wszystkich)"
 msgstr[1] "%s (%d nieprzeczytane od wszystkich)"
 msgstr[2] "%s (%d nieprzeczytanych od wszystkich)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3705,69 +3617,69 @@ msgstr[0] "Wysyłanie %d wiadomości"
 msgstr[1] "Wysyłanie %d wiadomości"
 msgstr[2] "Wysyłanie %d wiadomości"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Pisze wiadomość."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Wyczyść"
+msgid "_Conversation"
+msgstr "_Rozmowa"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakt"
+msgid "C_lear"
+msgstr "_Wyczyść"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Wstaw _emotikonę"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Ulubiony pokój rozmowy"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Zaproś _uczestnika…"
+msgid "Notify for All Messages"
+msgstr "Powiadamianie o wszystkich wiadomościach"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Przenieś kartę w l_ewo"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Lista kontaktów"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Przenieś kartę w p_rawo"
+msgid "Invite _Participant…"
+msgstr "Zaproś _uczestnika…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Powiadamianie o wszystkich wiadomościach"
+msgid "C_ontact"
+msgstr "K_ontakt"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Rozmowa"
+msgid "_Tabs"
+msgstr "_Karty"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Odłącz kartę"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Ulubiony pokój rozmowy"
+msgid "_Previous Tab"
+msgstr "_Poprzednia karta"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Następna karta"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Poprzednia karta"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Cofnij zamknięcie karty"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Lista kontaktów"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Przenieś kartę w l_ewo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Karty"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Przenieś kartę w p_rawo"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Cofnij zamknięcie karty"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Odłącz kartę"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3781,100 +3693,100 @@ msgstr "Pokój"
 msgid "Auto-Connect"
 msgstr "Automatyczne łączenie"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Zarządzanie ulubionymi pokojami"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Przychodząca rozmowa wideo"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Przychodząca rozmowa głosowa"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Wideorozmowa przychodząca od użytkownika %s. Odebrać ją?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Przychodząca rozmowa głosowa od użytkownika %s. Odebrać ją?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Przychodząca rozmowa głosowa od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Odrzuć"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Odbierz"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Odbierz z obrazem wideo"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Wideorozmowa przychodząca od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Zaproszenie do pokoju"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Zaproszenie do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "Użytkownik %s zaprasza do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Odmów"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s zaprosił użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Zaproszono użytkownika do dołączenia do %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Plik przychodzący od użytkownika %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Hasło wymagane"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s prosi o dostęp do informacji o obecności użytkownika online"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3884,105 +3796,105 @@ msgstr ""
 "Wiadomość: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s z %s o prędkości %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s z %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Odbieranie pliku \"%s\" od użytkownika %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Wysyłanie pliku \"%s\" do użytkownika %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Błąd podczas odbierania pliku \"%s\" od użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Błąd podczas odbierania pliku"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Błąd podczas wysyłania pliku \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Błąd podczas wysyłania pliku"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "Otrzymano plik \"%s\" od użytkownika %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "Wysłano \"%s\" do użytkownika %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Ukończono przesyłanie pliku"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Oczekiwanie na odpowiedź drugiej strony"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Sprawdzanie spójności pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Obliczanie sumy kontrolnej pliku \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Plik"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Pozostało"
 
@@ -3994,7 +3906,11 @@ msgstr "Przesyłanie plików"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Usuwa ukończone, anulowane lub nieudane przesyłania plików z listy"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Zaimportuj"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4002,171 +3918,197 @@ msgstr ""
 "Nie odnaleziono kont do zaimportowania. Program Empathy obecnie obsługuje "
 "importowanie kont tylko z programu Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importowanie kont"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
-msgstr "Zaimportuj"
+msgstr "Import"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokół"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Źródło"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Wprowadź hasło"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Rozłącz"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Należy ustawić konto, aby wyświetlić kontakty."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nie odnaleziono wyników"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Konta %s nie mogą być używane, dopóki oprogramowanie %s nie zostanie "
+"zaktualizowane."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Zaktualizuj oprogramowanie..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Zamknij"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Połącz ponownie"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Modyfikuj konto"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Zamknij"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Doładuj %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Doładowuje konto kredytowe"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Doładuj..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Należy włączyć jedno z kont, aby wyświetlić kontakty."
+
+#. 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 "Należy włączyć konto %s, aby wyświetlić kontakty."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista kontaktów"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakty na _mapie"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Ustawienia konta"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Saldo kredytowe"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nowa rozmowa…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Znajdź na _liście kontaktów"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nowa _rozmowa głosowa…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Dołącz do _ulubionych"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Wyszukaj kontakty…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Zarządzaj ulubionymi"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "_Przesyłanie plików"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Zwykły r_ozmiar"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "K_ontakty w trybie offline"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nowa _rozmowa głosowa…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Wyświetlanie p_rotokołów"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Zwykły rozmiar z _awatarami"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo kredytowe"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakty na _mapie"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Konta"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Za_blokowane kontakty"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referencje"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Wyświetlanie p_rotokołów"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Znajdź na _liście kontaktów"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Porządkowanie według _nazwy"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Porządkowanie według _stanu"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Konta"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Zwykły rozmiar z _awatarami"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Za_blokowane kontakty"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Zwykły r_ozmiar"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Zmniejszony ro_zmiar"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "_Przesyłanie plików"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Pokój"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Dołącz…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nowa rozmowa…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "K_ontakty w trybie offline"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "I_nformacje osobiste"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Pokój"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Dołącz do _ulubionych"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Wyszukaj kontakty…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Zarządzaj ulubionymi"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Pokój rozmowy"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Członkowie"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4179,22 +4121,27 @@ msgstr ""
 "Wymagane hasło: %s\n"
 "Członkowie: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Tak"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nie"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Nie można uruchomić listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Nie można zatrzymać listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Nie można wczytać listy pokoi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Dołączenie do pokoju"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4204,6 +4151,10 @@ msgstr ""
 "pokoi na liście."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Pokój:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4211,180 +4162,196 @@ msgstr ""
 "Proszę wprowadzić adres serwera obsługującego pokój lub pozostawić puste, "
 "jeśli pokój znajduje się na tym samym serwerze co bieżące konto"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Dołączenie do pokoju"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Nie można wczytać listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Listy pokoi"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Pokój:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Otrzymano wiadomość"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nowa rozmowa"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Kontakt przeszedł do trybu online"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Kontakt przeszedł do trybu offline"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
-msgstr "Konto połączone"
+msgstr "Połączono konto"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
-msgstr "Konto rozłączone"
+msgstr "Rozłączono konto"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Język"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo! Czemuż ty jesteś Romeo!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Wyrzecz się swego rodu, rzuć tę nazwę!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Lub jeśli tego nie możesz uczynić,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "To przysiąż wiernym być mojej miłości,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "A ja przestanę być z krwi Kapuletów."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Użytkownik Julia został rozłączony"
 
-#: ../src/empathy-preferences.c:1175
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferencje"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "_Emotikony jako obrazy"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Lista kontaktów w pokojach"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Wygląd"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Zachowanie"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Rozpoczynanie rozmów w:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Motyw _rozmowy:"
+msgid "new ta_bs"
+msgstr "nowych _kartach"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "_Bez powiadomień podczas nieobecności lub zajętości"
+msgid "new _windows"
+msgstr "nowych _oknach"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "B_ez odtwarzania dźwięków podczas nieobecności lub zajętości"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Wyświetlanie zdarzeń przychodzących w obszarze powiadamiania"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Automatycznie łączenie podczas _uruchamiania"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Usuwanie echa zwiększa czystość głosu użytkownika dla osoby po drugiej "
-"stronie, ale może powodować problemy na niektórych komputerach. Jeśli "
-"słychać dziwne dźwięki lub piski podczas rozmów, to należy spróbować "
-"wyłączyć usuwanie echa i ponownie rozpocząć rozmowę głosową."
+msgid "Log conversations"
+msgstr "Zapisywanie rozmów do dziennika"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu online"
+msgid "Behavior"
+msgstr "Zachowanie"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu offline"
+msgid "General"
+msgstr "Ogólne"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Powiadomienia, kiedy okno _rozmowy jest nieaktywne"
+msgid "_Enable bubble notifications"
+msgstr "Wy_skakujące powiadomienia"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Sprawdzanie pisowni dla języków:"
+msgid "Disable notifications when _away or busy"
+msgstr "_Bez powiadomień podczas nieobecności lub zajętości"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Ogólne"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Powiadomienia, kiedy okno _rozmowy jest nieaktywne"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Poziom wejściowy:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu online"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Głośność wejścia:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Powiadomienia, kiedy kontakt przeszedł do trybu offline"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Powiadomienia"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Źródła położenia:"
+msgid "_Enable sound notifications"
+msgstr "Powia_domienia dźwiękowe"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Zapisywanie rozmów do dziennika"
+msgid "Disable sounds when _away or busy"
+msgstr "B_ez odtwarzania dźwięków podczas nieobecności lub zajętości"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Powiadomienia"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Odtwarzanie dźwięków zdarzeń"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Dźwięki"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Prywatność"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usuwanie _echa w celu zwiększenia jakości rozmowy"
 
 #: ../src/empathy-preferences.ui.h:23
 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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"Usuwanie echa zwiększa czystość głosu użytkownika dla osoby po drugiej "
+"stronie, ale może powodować problemy na niektórych komputerach. Jeśli "
+"słychać dziwne dźwięki lub piski podczas rozmów, to należy spróbować "
+"wyłączyć usuwanie echa i ponownie rozpocząć rozmowę głosową."
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Publikowanie położenia kontaktom"
+
+#: ../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."
@@ -4393,295 +4360,296 @@ msgstr ""
 "miasto, stan/województwo i kraj. Koordynaty GPS będą dokładne do 1 miejsca "
 "po przecinku."
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "_Emotikony jako obrazy"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "_Lista kontaktów w pokojach"
-
-#: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Dźwięki"
-
-#: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Sprawdzanie pisowni"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "Lista języków odzwierciedla stan faktycznie zainstalowanych słowników."
-
+#. 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 "Themes"
-msgstr "Motywy"
+msgid "_Reduce location accuracy"
+msgstr "_Zmniejszenie dokładności położenia"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Usuwanie _echa w celu zwiększenia jakości rozmowy"
+msgid "Privacy"
+msgstr "Prywatność"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "Variant:"
-msgstr "Wariant:"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Automatically connect on startup"
-msgstr "Automatycznie łączenie podczas _uruchamiania"
-
-#: ../src/empathy-preferences.ui.h:33
 msgid "_Cellphone"
 msgstr "_Telefon komórkowy"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "_Enable bubble notifications"
-msgstr "Wy_skakujące powiadomienia"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Sieć (IP, Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:35
-msgid "_Enable sound notifications"
-msgstr "Powia_domienia dźwiękowe"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Źródła położenia:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_GPS"
-msgstr "_GPS"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "Lista języków odzwierciedla stan faktycznie zainstalowanych słowników."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Sieć (IP, Wi-Fi)"
+msgid "Enable spell checking for languages:"
+msgstr "Sprawdzanie pisowni dla języków:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Open new chats in separate windows"
-msgstr "_Otwieranie nowych rozmów w oddzielnych oknach"
+msgid "Spell Checking"
+msgstr "Sprawdzanie pisowni"
 
 #: ../src/empathy-preferences.ui.h:39
-msgid "_Publish location to my contacts"
-msgstr "_Publikowanie położenia kontaktom"
+msgid "Chat Th_eme:"
+msgstr "Motyw _rozmowy:"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Wariant:"
 
-#. 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:41
-msgid "_Reduce location accuracy"
-msgstr "_Zmniejszenie dokładności położenia"
+msgid "Themes"
+msgstr "Motywy"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stan"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Zadzwoń jeszcze raz"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera jest wyłączona"
+msgid "Redial"
+msgstr "Wybierz ponownie"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera jest włączona"
+msgid "V_ideo"
+msgstr "_Wideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Obraz jest wyłączony"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
+msgid "Video Preview"
+msgstr "Podgląd obrazu"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Włączenie kamery i wysyłania obrazu"
+msgid "Video On"
+msgstr "Obraz jest włączony"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Włączenie kamery, ale bez wysyłania obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Zadzwoń jeszcze raz"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Podgląd"
+msgid "Camera Off"
+msgstr "Kamera jest wyłączona"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Wybierz ponownie"
+msgid "Disable camera and stop sending video"
+msgstr "Wyłączenie kamery i zatrzymanie wysyłania obrazu"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Wideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Podgląd"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Obraz jest wyłączony"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Włączenie kamery, ale bez wysyłania obrazu"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Obraz jest włączony"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera jest włączona"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Podgląd obrazu"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Włączenie kamery i wysyłania obrazu"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Widok mapy kontaktów"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Zapisz"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Odnośnik serwisu Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Odpowiedź serwisu Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Dane są za duże na jeden raz. Proszę zapisać dzienniki do pliku."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Okno debugowania"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Wyślij do serwisu Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Poziom "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Debugowanie"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informacje"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Krytyczny"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Błąd"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Poziom"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Wybrany menedżer połączenia nie obsługuje rozszerzenia zdalnego debugowania."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Zaproszenie uczestnika"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Proszę wybrać kontakt do zaproszenia do rozmowy:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Zaproś"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Bez wyświetlania żadnych okien; wykonuje zadanie (np. importowanie) i kończy "
 "działanie"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Bez wyświetlania żadnych okien, o ile istnieją tylko konta \"Osób w pobliżu\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Początkowo wybiera podane konto (np. gabble/jabber/foo_40przykład_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<identyfikator-konta>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
-msgstr "- Konta programu Empathy"
+msgstr "- konta programu Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Konta programu Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Wyświetla konkretną usługę"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- debuger programu Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Debuger programu Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
-msgstr " - komunikator Empathy"
+msgstr "- komunikator Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Odpowiedz"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Odrzuć"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Odbierz"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Odbierz z obrazem wideo"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Odmów"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Zaakceptuj"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Wprowadź"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr ""
@@ -4690,28 +4658,71 @@ msgstr ""
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Odłożone"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Wycisz"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Czas trwania"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Obecnie saldo wynosi %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Brak wystarczających środków na tę rozmowę głosową."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Doładuj"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Rozróżnianie wielkości liter"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Rodzaj posiadanego konta rozmów:"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Dodawanie nowego konta"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Osoby w pobliżu"
+
+#: ../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."
+msgstr ""
+"Program Empathy może automatycznie wykrywać i umożliwiać rozmowę z osobami "
+"połączonymi do tej samej sieci. Aby używać tej funkcji, proszę sprawdzić, "
+"czy poniższe dane są poprawne."
+
+#: ../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 ""
+"Można je łatwo zmienić w późniejszym czasie lub wyłączyć tę funkcję "
+"wybierając <span style=\"italic\">Edycja → Konta</span> na liście kontaktów."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 0f6ac546b..bd45e6a17 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,538 +4,592 @@
 # Luiz Guaraldo <software.livre@terra.com.br>, 2004.
 # André Filipe de Assunção e Brito <decko@ufpr.br>, 2007.
 # Og Maciel <ogmaciel@gnome.org>, 2007-2009, 2011.
-# Djavan Fagundes <djavan@comum.org>, 2008, 2010.
+# Djavan Fagundes <djavan@comum.org>, 2008, 2010, 2012.
 # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008-2009.
 # Leonardo Ferreira Fontenelle <leonardof@gnome.org>, 2008.
 # Taylon Silmer <taylonsilva@gmail.com>, 2009.
 # Michel Recondo <michel@recondo.com.br>, 2009.
 # Vladimir Melo <vmelo@gnome.org>, 2009.
 # Rodrigo L. M. Flores <mail@rodrigoflores.org>, 2009.
-# André Gondim <andregondim@ubuntu.com>, 2009.
-# Jonh Wendell <jwendell@gnome.org>, 2009, 2010.
+# André Gondim <In Memoriam>, 2009.
 # Henrique P. Machado <hpmachado@gnome.org>, 2010.
 # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
 # Felipe Borges <felipe10borges@gmail.com>, 2011.
 # Antonio Fernandes C. Neto <fernandesn@gnome.org>, 2011.
+# Jonh Wendell <jwendell@gnome.org>, 2009, 2010, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-15 19:02+0000\n"
-"PO-Revision-Date: 2011-09-15 16:24-0300\n"
-"Last-Translator: Antonio Fernandes C. Neto <fernandesn@gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 16:00+0000\n"
+"PO-Revision-Date: 2012-03-09 11:05-0200\n"
+"Last-Translator: Djavan Fagundes <djavan@comum.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Converse no Google Talk, Facebook, MSN e muitos outros serviços de bate-papo"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Cliente de mensagens instantâneas"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Mensageiro Instantâneo Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Cliente de mensagens instantâneas"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Converse no Google Talk, Facebook, MSN e muitos outros serviços de bate-papo"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2454
+msgid "Messaging and VoIP Accounts"
+msgstr "Contas de Mensagem e VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Gerencia contas de mensagem e VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Sempre abrir uma janela de bate-papo separada para novos bate-papos."
+msgid "Connection managers should be used"
+msgstr "Devem ser utilizados gerenciadores de conexão"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Volume da chamada"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Usa gerenciadores de conexão para desconectar/reconectar automaticamente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Volume de chamada, como uma porcentagem."
+msgid "Empathy should auto-connect on startup"
+msgstr "Conectar-se automaticamente ao iniciar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Dispositivo da câmera"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Conecta automaticamente às suas contas ao iniciar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Posição da câmera"
+msgid "Empathy should auto-away when idle"
+msgstr "O Empathy deve definir como ausente automaticamente quando ocioso"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Caracteres para adicionar depois do apelido quando usar completamento de "
-"apelidos (tab) em bate-papo em grupo."
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Deve ir ao modo ausente automaticamente se o usuário estiver ocioso."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema para a janela de bate-papo"
+msgid "Empathy default download folder"
+msgstr "Pasta padrão de download do Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Variante do tema da janela de conversa"
+msgid "The default folder to save file transfers in."
+msgstr "A pasta padrão onde salvar os arquivos transferidos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Lista, separada por vírgulas, de idiomas de verificação ortográfica para "
-"usar (ex: \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Número mágico usado para verificar se deve executar tarefas de limpeza"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Lista de contatos compacta"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c usa esse número para verificar se as tarefas de "
+"limpeza devem ser executadas ou não. Usuários não devem mudar essa chave "
+"manualmente."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Devem ser utilizados gerenciadores de conexão"
+msgid "Show offline contacts"
+msgstr "Mostra contatos desconectados"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Critério de ordenação da lista de contatos"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Mostra os contatos que estão desconectados na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Dispositivo de câmera padrão para uso em chamadas de vídeo, por exemplo, /"
-"dev/video0."
+msgid "Show avatars"
+msgstr "Mostra avatares"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Diretório padrão para selecionar uma imagem para seu perfil"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Mostra os avatares para contatos na lista de contatos e janelas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Desabilitar notificações quando ausente"
+msgid "Show protocols"
+msgstr "Exibir protocolos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Desabilitar sons quando ausente"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Mostra os protocolos para contatos na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Exibir eventos recebidos na área de status"
+msgid "Show Balance in contact list"
+msgstr "Mostrar créditos na lista de contatos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Exibe eventos recebidos na área de status. Se falso, apresenta-os "
-"imediatamente ao usuário."
+msgid "Whether to show account balances in the contact list."
+msgstr "Mostra os créditos das contas na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Suporte para cancelamento de eco"
+msgid "Compact contact list"
+msgstr "Lista de contatos compacta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "O Empathy pode publicar a localização do usuário"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Mostra a lista de contatos no modo compacto."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "O Empathy pode usar o GPS para adivinhar a localização"
+msgid "Hide main window"
+msgstr "Ocultar janela principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "O Empathy pode usar a rede de celular para adivinhar a localização"
+msgid "Hide the main window."
+msgstr "Oculta a janela principal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "O Empathy pode usar a rede para adivinhar a localização"
+msgid "Default directory to select an avatar image from"
+msgstr "Diretório padrão para selecionar uma imagem para seu perfil"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Pasta padrão de download do Empathy"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "O último diretório onde uma imagem de avatar foi escolhida."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "O Empathy migrou os registros do butterfly"
+msgid "Open new chats in separate windows"
+msgstr "Abre novos bate-papos em janelas separadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "O Empathy deve definir como ausente automaticamente quando ocioso"
+msgid "Always open a separate chat window for new chats."
+msgstr "Sempre abrir uma janela de bate-papo separada para novos bate-papos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Conectar-se automaticamente ao iniciar"
+msgid "Display incoming events in the status area"
+msgstr "Exibir eventos recebidos na área de status"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "O Empathy deve reduzir a precisão da localização"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Exibe eventos recebidos na área de status. Se falso, apresenta-os "
+"imediatamente ao usuário."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Usar o avatar dos contatos como ícone da janela de bate-papo"
+msgid "The position for the chat window side pane"
+msgstr "A posição da janela de bate-papo no painel lateral"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Habilitar Ferramentas de Desenvolvedor WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr ""
+"A posição armazenada (em pixels) da janela de bate-papo no painel lateral."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Habilitar notificação para novas mensagens"
+msgid "Show contact groups"
+msgstr "Mostra grupos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Habilitar verificador ortográfico"
+msgid "Whether to show groups in the contact list."
+msgstr "Mostra ou não os grupos na lista de contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Ocultar janela principal"
+msgid "Contact list sort criterion"
+msgstr "Critério de ordenação da lista de contatos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Oculta a janela principal."
+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 ""
+"Qual critério usar para ordernar a lista de contatos. O padrão é ordernar "
+"pelo estado do contato, se o valor for \"state\". Se o valor for \"name\", a "
+"ordenação é feita pelo nome."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Caractere de completamento de apelidos"
+msgid "Use notification sounds"
+msgstr "Usa sons de notificação"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Abre novos bate-papos em janelas separadas"
+msgid "Whether to play a sound to notify of events."
+msgstr "Reproduzir um som de notificação para eventos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Caminho do tema do Adium para utilizar"
+msgid "Disable sounds when away"
+msgstr "Desabilitar sons quando ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Caminho do tema do Adium para usar se o tema usado para este bate-papo é do "
-"Adium."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Reproduz ou não sons de notificação quando ausente ou ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Reproduz um som quando receber mensagens"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Reproduz um som para novas conversas"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Reproduzir um som de notificação para mensagens recebidas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Reproduz um som para mensagens enviadas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Reproduz um som quando um contato conectar"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Reproduzir um som de notificação para mensagens enviadas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Reproduz um som quando um contato desconectar"
+msgid "Play a sound for new conversations"
+msgstr "Reproduz um som para novas conversas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Reproduz um som quando conectarmos"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Reproduzir um som de notificação para novas conversas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Reproduz um som quando desconectarmos"
+msgid "Play a sound when a contact logs in"
+msgstr "Reproduz um som quando um contato conectar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Mostra notificações se a janela de bate-papo não estiver em foco"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr ""
+"Reproduz ou não um som de notificação para contatos conectando-se à rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Mostra notificações quando um contato conecta"
+msgid "Play a sound when a contact logs out"
+msgstr "Reproduz um som quando um contato desconectar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Mostra notificações quando um contato desconecta"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr ""
+"Reproduz ou não um som de notificação para contatos desconectando-se da rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Posição de visualização da câmera que deve estar durante a chamada."
+msgid "Play a sound when we log in"
+msgstr "Reproduz um som quando conectarmos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Mostrar créditos na lista de contatos"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Reproduzir um som de notificação ao conectar-se em uma rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Mostra avatares"
+msgid "Play a sound when we log out"
+msgstr "Reproduz um som quando desconectarmos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Mostra lista de contatos nas salas"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Reproduzir um som de notificação ao desconectar-se de uma rede."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Mostra dica sobre como fechar a janela principal"
+msgid "Enable popup notifications for new messages"
+msgstr "Habilitar notificação para novas mensagens"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Mostra contatos desconectados"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Mostra uma notificação quando receber uma nova mensagem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Exibir protocolos"
+msgid "Disable popup notifications when away"
+msgstr "Desabilitar notificações quando ausente"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Idiomas para verificação ortográfica"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Mostra uma notificação quado estiver ausente ou ocupado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "A pasta padrão onde salvar os arquivos transferidos."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Mostra notificações se a janela de bate-papo não estiver em foco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "O último diretório onde uma imagem de avatar foi escolhida."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Mostra uma notificação quando receber uma nova mensagem mesmo se a janela de "
+"bate papo estiver aberta, mas não estiver com o foco."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "A posição da janela de bate-papo no painel lateral"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Mostra notificações quando um contato conecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
-"A posição armazenada (em pixels) da janela de bate-papo no painel lateral."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Mostra uma notificação quando um contato conectar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "O tema que é usado para exibir a conversa em janelas de bate-papo."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Mostra notificações quando um contato desconecta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"A variação do tema que é usada para exibir a conversa em janelas de bate-"
-"papo."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Mostra uma notificação quando um contato estiver desconectado."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Usa smileys gráficos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Usa sons de notificação"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Converte os smileys para imagens gráficas durante as conversas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Usa tema para salas de bate-papo"
+msgid "Show contact list in rooms"
+msgstr "Mostra lista de contatos nas salas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Publica a localização do usuário para seus contatos."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Mostra a lista de contatos nas salas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Usa o GPS para adivinhar a localização."
+msgid "Chat window theme"
+msgstr "Tema para a janela de bate-papo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Usa a rede de celular para adivinhar a localização."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "O tema que é usado para exibir a conversa em janelas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Usa a rede para adivinhar a localização."
+msgid "Chat window theme variant"
+msgstr "Variante do tema da janela de conversa"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Pergunta sobre migrar os registros do butterfly."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr ""
+"A variação do tema que é usada para exibir a conversa em janelas de bate-"
+"papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Conecta automaticamente às suas contas ao iniciar."
+msgid "Path of the Adium theme to use"
+msgstr "Caminho do tema do Adium para utilizar"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Deve ir ao modo ausente automaticamente se o usuário estiver ocioso."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Caminho do tema do Adium para usar se o tema usado para este bate-papo é do "
+"Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Reduz a precisão de localização por razões de privacidade."
+msgid "Enable WebKit Developer Tools"
+msgstr "Habilitar Ferramentas de Desenvolvedor WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Habilita ferramentas de desenvolvedor WebKit, como o Web Inspector."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Informar aos outros usuários quando você está digitando"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Usa gerenciadores de conexão para desconectar/reconectar automaticamente."
+"Envia ou não os estados \"composing\" ou \"paused\" no bate-papo. Atualmente "
+"não afeta o estado \"gone\"."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr ""
-"Verifica as palavras digitadas usando os idiomas escolhidos para verificação "
-"ortográfica."
+msgid "Use theme for chat rooms"
+msgstr "Usa tema para salas de bate-papo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Converte os smileys para imagens gráficas durante as conversas."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Usa o tema em salas de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Habilitar filtro de cancelamento de eco do Pulseaudio."
+msgid "Spell checking languages"
+msgstr "Idiomas para verificação ortográfica"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Reproduz ou não um som de notificação para contatos conectando-se à rede."
+"Lista, separada por vírgulas, de idiomas de verificação ortográfica para "
+"usar (ex: \"en, fr, nl\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"Reproduz ou não um som de notificação para contatos desconectando-se da rede."
+msgid "Enable spell checker"
+msgstr "Habilitar verificador ortográfico"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Reproduzir um som de notificação para eventos."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr ""
+"Verifica as palavras digitadas usando os idiomas escolhidos para verificação "
+"ortográfica."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Reproduzir um som de notificação para mensagens recebidas."
+msgid "Nick completed character"
+msgstr "Caractere de completamento de apelidos"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Reproduzir um som de notificação para novas conversas."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Caracteres para adicionar depois do apelido quando usar completamento de "
+"apelidos (tab) em bate-papo em grupo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Reproduzir um som de notificação para mensagens enviadas."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Usar o avatar dos contatos como ícone da janela de bate-papo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Reproduzir um som de notificação ao conectar-se em uma rede."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Usa os avatares da lista de contatos como ícones da janela de bate-papo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Reproduzir um som de notificação ao desconectar-se de uma rede."
+msgid "Last account selected in Join Room dialog"
+msgstr "Última conta escolhida ao entrar numa sala"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Reproduz ou não sons de notificação quando ausente ou ocupado."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Caminho D-Bus da última conta escolhida ao entrar numa sala."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Mostra uma notificação quando um contato estiver desconectado."
+msgid "Camera device"
+msgstr "Dispositivo da câmera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Mostra uma notificação quando um contato conectar."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Dispositivo de câmera padrão para uso em chamadas de vídeo, por exemplo, /"
+"dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Mostra uma notificação quando receber uma nova mensagem mesmo se a janela de "
-"bate papo estiver aberta, mas não estiver com o foco."
+msgid "Camera position"
+msgstr "Posição da câmera"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Mostra uma notificação quando receber uma nova mensagem."
+msgid "Position the camera preview should be during a call."
+msgstr "Posição de visualização da câmera que deve estar durante a chamada."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Mostra os créditos das contas na lista de contatos."
+msgid "Echo cancellation support"
+msgstr "Suporte para cancelamento de eco"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Mostra os avatares para contatos na lista de contatos e janelas de bate-papo."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Habilitar filtro de cancelamento de eco do Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Mostra os contatos que estão desconectados na lista de contatos."
+msgid "Show hint about closing the main window"
+msgstr "Mostra dica sobre como fechar a janela principal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Mostra uma notificação quado estiver ausente ou ocupado."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Mostra o diálogo de mensagens sobre fechar a janela principal com o botão \"x"
+"\" na barra do título."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Mostra os protocolos para contatos na lista de contatos."
+msgid "Empathy can publish the user's location"
+msgstr "O Empathy pode publicar a localização do usuário"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Mostra a lista de contatos nas salas de bate-papo."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Publica a localização do usuário para seus contatos."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Mostra a lista de contatos no modo compacto."
+msgid "Empathy can use the network to guess the location"
+msgstr "O Empathy pode usar a rede para adivinhar a localização"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Mostra o diálogo de mensagens sobre fechar a janela principal com o botão \"x"
-"\" na barra do título."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Usa a rede para adivinhar a localização."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Usa o tema em salas de bate-papo."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "O Empathy pode usar a rede de celular para adivinhar a localização"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Usa a rede de celular para adivinhar a localização."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "O Empathy pode usar o GPS para adivinhar a localização"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Usa o GPS para adivinhar a localização."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "O Empathy deve reduzir a precisão da localização"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
-msgstr ""
-"Qual critério usar quando ordenando a lista de contatos. Por padrão a "
-"ordenação é feita usando o nome do contato com o valor \"nome\". Um valor de "
-"\"estado\" ordenará a lista de contatos por estado."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Reduz a precisão de localização por razões de privacidade."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Gerencia contas de mensagem e VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nenhum motivo foi especificado"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Contas de Mensagem e VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "A alteração de estado foi solicitada"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Você cancelou a transferência do arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "O outro participante cancelou a transferência do arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Erro ao tentar transferir o arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "O outro participante não pode transferir o arquivo"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Motivo desconhecido"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Transferência de arquivo concluída, porém o arquivo estava corrompido"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Transferência de arquivo sem suporte pelo seu contato"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "O arquivo selecionado não é um arquivo regular"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "O arquivo selecionado é vazio"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Chamada perdida de %s"
@@ -551,172 +605,141 @@ msgstr "Chamou %s"
 msgid "Call from %s"
 msgstr "Chamada de %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Tipo de soquete sem suporte"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nenhum motivo foi especificado"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "A alteração de estado foi solicitada"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Você cancelou a transferência do arquivo"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "O outro participante cancelou a transferência do arquivo"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Erro ao tentar transferir o arquivo"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "O outro participante não pode transferir o arquivo"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "Motivo desconhecido"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Disponível"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Desconectado"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nenhum motivo especificado"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "O status está definido como desconectado"
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Erro de rede"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Falha de autenticação"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Erro de criptografia"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Nome já em uso"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certificado não fornecido"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certificado não confiável"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certificado expirado"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certificado não ativado"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Certificado com nome de máquina incorreto"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certificado com impressão digital incorreto"
 
 # self-signed  - Deixei como próprio
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Certificado próprio"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Erro de certificado"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Criptografia não disponível"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certificado inválido"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "A conexão foi recusada"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Não é possível estabelecer conexão"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "A conexão foi perdida"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "Este recurso já está conectado ao servidor"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Esta conta já está conectada ao servidor"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr ""
 "A conexão foi substituída por uma nova conexão usando os mesmos recursos"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "A conta já existe no servidor"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "O servidor está atualmente muito ocupado para lidar com a conexão"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "O certificado foi revogado"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "O certificado usa um algoritmo de cifragem inseguro ou é criptograficamente "
 "fraco"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -725,285 +748,279 @@ msgstr ""
 "certificado do servidor excede os limites impostos pela biblioteca de "
 "criptografia"
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Seu software é muito antigo"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Erro interno"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Pessoas por perto"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! japonês"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Bate-papo Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d segundo atrás"
 msgstr[1] "%d segundos atrás"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minuto atrás"
 msgstr[1] "%d minutos atrás"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d hora atrás"
 msgstr[1] "%d horas atrás"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dia atrás"
 msgstr[1] "%d dias atrás"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d semana atrás"
 msgstr[1] "%d semanas atrás"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d mês atrás"
 msgstr[1] "%d meses atrás"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "no futuro"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Senha não encontrada"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "A senha da conta de MI para %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "A senha para a conferência \"%s\" na conta %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Todas as contas"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Conta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Senha"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Porta"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Minhas contas web"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "A conta %s é editada através do %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "A conta %s não pode ser editada no Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Iniciar Minhas contas web"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Editar %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Nome de usuário:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "A_plicar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "C_onectar"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Esta conta já existe no servidor"
 
 # Tooltip.
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Criar uma nova conta no servidor"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_Cancelar"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s em %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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Conta no %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nova conta"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exemplo:</b> MeuNomeExibido"
+#: ../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:"
+msgstr "Se_nha:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avançado"
+msgid "Screen _Name:"
+msgstr "_Nome exibido:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exemplo:</b> MeuNomeExibido"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "Se_nha:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Lembrar senha"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Lembrar senha"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Porta:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Lembrar senha"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nome exibido:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Servidor:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Qual é a sua senha do AIM?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avançado"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Qual é o seu apelido do AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Porta:"
+msgid "What is your AIM password?"
+msgstr "Qual é a sua senha do AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Servidor:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Exemplo:</b> nome de usuário"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Lembrar senha"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "I_D de login:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exemplo:</b> nome de usuário"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Qual é o seu ID de usuário GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Qual é a sua senha do GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exemplo:</b> 123456789"
 
 # Changed from Og's "conjunto de caracteres because of little room.
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "C_odificação de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Qual é o seu UIN do ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Qual é a sua senha do ICQ?"
 
@@ -1040,12 +1057,24 @@ msgstr "Opções"
 msgid "None"
 msgstr "Nenhum"
 
-# Changed from Og's "conjunto de caracteres because of little room.
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Rede"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Rede:"
+
+# Changed from Og's "conjunto de caracteres because of little room.
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Codificação de caracteres:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Servidores"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1053,14 +1082,6 @@ msgstr ""
 "A maioria dos servidores de IRC não precisa de uma senha, por isso, se você "
 "não tiver certeza, não digite uma senha."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Rede"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Rede:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Apelido:"
@@ -1077,48 +1098,20 @@ msgstr "Mensagem de saída:"
 msgid "Real name:"
 msgstr "Nome verdadeiro:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servidores"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Qual é o seu apelido do IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Qual rede IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Exemplo:</b> usuário@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Examplo:</b> usuário@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Criptografia r_equerida (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ignorar erros de certificado SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Sobrescrever configurações do servidor"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oridade:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Qual é o seu apelido do IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Rec_urso:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Qual é o seu nome de usuário do Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1130,211 +1123,235 @@ msgstr ""
 "Utilize <a href=\"http://www.facebook.com/username/\">nesta página</a> para "
 "escolher um nome de usuário para o Facebook se você não possuir um."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Usar criptografia SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Qual é a sua senha do Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Qual é o seu nome de usuário do Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Qual é o seu ID do Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Exemplo:</b> usuário@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Qual é a sua senha do Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Examplo:</b> usuário@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ignorar erros de certificado SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oridade:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Rec_urso:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Criptografia r_equerida (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Usar criptografia SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Sobrescrever configurações do servidor"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Qual é o seu ID do Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Qual é a sua senha do Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Qual é o seu ID do Jabber desejado?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Qual é a sua senha do Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Qual é a sua senha do Jabber desejada?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exemplo:</b> usuario@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Qual é seu ID do Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Qual é a sua senha do Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Endereço de e-_mail:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "Apeli_do:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Sobrenome:"
+
 # A mensagem original termina em espaço, mas suas análogas não.
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Primeiro nome:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Nome _publicado:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "ID do _Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Sobrenome:"
+msgid "E-_mail address:"
+msgstr "Endereço de e-_mail:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Nome _publicado:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Nome de usuário:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Exemplo:</b> usuario@meu.servidor.sip"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Autenticação do nome do usuário:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Descobrir Binding"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Descobrir o servidor STUN automaticamente"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Usar essa conta para chamar telefones e celulares"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorar erros TLS"
+msgid "NAT Traversal Options"
+msgstr "Opções transversais de NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervalo (segundos)"
+msgid "Proxy Options"
+msgstr "Opções de Proxy"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opções Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Opções de miscelânea"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Roteamento frouxo"
+msgid "STUN Server:"
+msgstr "Servidor STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mecanismo:"
+msgid "Discover the STUN server automatically"
+msgstr "Descobrir o servidor STUN automaticamente"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Opções de miscelânea"
+msgid "Discover Binding"
+msgstr "Descobrir Binding"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opções transversais de NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opções Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Porta:"
+msgid "Mechanism:"
+msgstr "Mecanismo:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opções de Proxy"
+msgid "Interval (seconds)"
+msgstr "Intervalo (segundos)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Autenticação do nome do usuário:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transporte:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Servidor STUN:"
+msgid "Loose Routing"
+msgstr "Roteamento frouxo"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Servidor:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorar erros TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transporte:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Usar essa conta para chamar telefones e celulares"
+msgid "Port:"
+msgstr "Porta:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Qual é a senha da sua conta SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Qual é o seu ID de conexão do SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Nome de usuário:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Qual é a senha da sua conta SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "I_D do Yahoo!:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ignorar convites de conferências e bate-papo"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Local da l_ista da sala:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Qual é o seu ID do Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Qual é a sua senha do Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "I_D do Yahoo!:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Local da l_ista da sala:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:470
-#: ../libempathy-gtk/empathy-avatar-chooser.c:555
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "Não foi possível converter a imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr ""
 "Seu sistema não oferece suporte a nenhum dos formatos de imagem aceitos"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:818
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
 msgid "Couldn't save picture to file"
 msgstr "Não foi possível salvar a foto para o arquivo"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:934
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "Selecione sua imagem de avatar"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "Tirar uma foto..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:941
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "Nenhuma imagem"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "Imagens"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "Todos os arquivos"
 
@@ -1342,61 +1359,65 @@ msgstr "Todos os arquivos"
 msgid "Click to enlarge"
 msgstr "Clique para ampliar"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Ocorreu um erro ao iniciar a chamada"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "O contato especificado não suporta chamadas"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "O contato especificado está desconectado."
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "O contato especificado é inválido"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Chamadas de emergência não são suportadas por este protocolo"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Você não possui créditos suficientes para efetuar esta chamada"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Falhou ao abrir bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Tópico sem suporte nesta conversa"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Você não está autorizado a alter o tópico"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "\"%s\" não é um identificador de contato válido"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: limpa todas as mensagens da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tópico>: define o tópico da conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID da sala de bate-papo>: entra em uma nova sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID da sala de bate-papo> Entra em uma nova sala de bate-papo"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1404,23 +1425,23 @@ msgstr ""
 "/part [<ID sala de bate-papo>] [<motivo>]: abandonar a sala de bate-papo, "
 "por padrão a sala atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID do contato> [<mensagem>]: abre um bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID do contato> [<mensagem>]: abre um bate-papo privado"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <apelido>: altera o seu apelido no servidor atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <mensagem>: envia uma mensagem de AÇÃO para a conversa atual"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1430,11 +1451,11 @@ msgstr ""
 "enviar uma mensagem iniciando com \"/\". Por exemplo: \"/say /join é "
 "utilizado para entrar em uma nova sala de bate-papo\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID do contato>: exibe informações sobre um contato"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1442,113 +1463,126 @@ msgstr ""
 "/help [<comando>]: mostra todos os comandos suportados. Se <comando> estiver "
 "definido, será exibido instruções de uso."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Utilização: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Comando desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Comando desconhecido; veja /help para os comandos disponíveis"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "Créditos insuficientes para enviar mensagens"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Erro ao enviar a mensagem \"%s\": %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Erro ao enviar mensagem: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "créditos insuficientes. <a href='%s'>Voltar</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "incapaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "desconectado"
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "contato inválido"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "permissão negada"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "mensagem muito longa"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "não implementado"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Erro enviando mensagem \"%s\": %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Erro ao enviar mensagem: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tópico:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tópico definido como: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Tópico definido por %s como: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Nenhum tópico definido"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Sem sugestões)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Adicionar \"%s\" ao dicionário %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
-msgstr "Inserir smiley"
+msgstr "Inserir carinha"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Enviar"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Sugestões de ortografia"
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Falha ao receber os registros recentes"
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s desconectou"
@@ -1556,12 +1590,12 @@ msgstr "%s desconectou"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s foi expulso por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s foi expulso"
@@ -1569,17 +1603,17 @@ msgstr "%s foi expulso"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s foi banido por %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s foi banido"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s saiu da sala"
@@ -1589,108 +1623,108 @@ msgstr "%s saiu da sala"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s entrou na sala"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s é agora conhecido como %s"
+msgstr "%s agora chama-se %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:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Deseja armazenar esta senha?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Lembrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Agora não"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Repetir"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Senha errada; por favor, tente novamente:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Esta sala é protegida por uma senha:"
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Entrar"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Conversa"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
 msgstr "Identificador inválido ou desconhecido"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Contact blocking temporarily unavailable"
 msgstr "Bloqueio de contatos temporariamente indisponível"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking unavailable"
 msgstr "Bloqueio de contatos indisponível"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Permission Denied"
 msgstr "Permissão negada"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
 msgid "Could not block contact"
 msgstr "Impossível bloquear o contato"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
 msgid "Edit Blocked Contacts"
 msgstr "Editar contatos bloqueados"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Conta:"
 
@@ -1700,466 +1734,371 @@ msgstr "Contatos _bloqueados"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "_Remover"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Copiar endereço do link"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "Abrir _link"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A, %d de %B de %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Editar informações do contato"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Informações pessoais"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Novo contato"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Bloquear %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
 "Tem a certeza de que deseja bloquear \"%s\" impedindo-o de o contatar "
 "novamente?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_Reportar este contato como abusivo"
 msgstr[1] "_Reportar estes contatos como abusivos"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Decidir _depois"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Requisição de inscrição"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Bloquear usuário"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Sem grupo"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Amigos prediletos"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Você realmente deseja remover o grupo \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Removendo grupo"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Remover"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Você realmente deseja remover o contato \"%s\"?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Removendo contato"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Adicionar Contato..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Bloquear contato"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Bate-papo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Chamada de áudio"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "Chamada de _vídeo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Conversas anteriores"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Enviar arquivo"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Compartilhar minha área de trabalho"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Favoritos"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "Infor_mações"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Convidando você para esta sala"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "Conv_idar para sala de bate-papo"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Decidir _depois"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Pesquisar contatos"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Pesquisar: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "_Adicionar Contato"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nenhum contato encontrado"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Sua mensagem introduzindo-se:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Por favor, deixe-me ver quando você estiver online. Muito obrigado!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Selecionar contato..."
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Nome completo:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Telefone:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Endereço de e-mail:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Site da web:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Aniversário:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Última atividade:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Conectado a partir de:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Mensagem de ausência:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Canais:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Código ISO do país:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "País:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Estado:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Área:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "CEP:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Endereço:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Construção:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Andar:"
 
 # Evitar colisão com _Salvar
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Texto:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nível de eficácia:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Erro na vertical (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Erro na horizontal (metros):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Direção:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Taxa de subida:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Atualizado pela última vez em:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Longitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Latitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Altitude:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Localização"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y em %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Salvar avatares"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Não foi possível salvar o avatar"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Localização</b> em (data)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Apelido:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Informações do cliente"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Cliente:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Detalhes pessoais"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalhes do contato"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Nome completo"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Telefone"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Endereço de e-mail"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Site da web"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Aniversário"
+
+#. 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 "Última atividade:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Conectado a partir de:"
+
+#. 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 "Mensagem de ausência:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "trabalho"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "casa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "móvel"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "voz"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "principal"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "recado"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "temporário"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identificação:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Apelido:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Localização</b> em (data)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Informação solicitada…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Informações do cliente"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "SO:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Versão:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupos"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2167,106 +2106,172 @@ msgstr ""
 "Selecione os grupos nos quais este contato aparecerá. Observe que você pode "
 "selecionar mais de um grupo ou nenhum grupo."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Adicionar grupo"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Selecionar"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupo"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "A seguinte identidade será bloqueada:"
 msgstr[1] "As seguintes identidades serão bloqueadas:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Não é possível bloquear a seguinte identidade:"
 msgstr[1] "Não é possível bloquear as seguintes identidades:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Contatos agrupados"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Selecionar contato para agrupar"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Visualização de novo contato"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr ""
-"Contatos selecionados na lista da esquerda serão conectados todos juntos."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Editar informações do contato"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Selecionar a conta que será usada para fazer a chamada"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Chamar"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Móvel"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "CASA"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Bloquear contato"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Bate-papo"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Chamada de áudio"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "Chamada de _vídeo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Conversas anteriores"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Enviar arquivo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Compartilhar minha área de trabalho"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Favoritos"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts não está instalado"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+"Por favor, instale o pacote gnome-contacts para ter acesso aos detalhes do "
+"contato."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Infor_mações"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Editar"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "Agr_upar contatos…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Convidando você para esta sala"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Conv_idar para sala de bate-papo"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Adicionar Contato..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Apagar e _bloquear"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Você realmente deseja remover o grupo \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Removendo grupo"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Remover"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Você realmente deseja remover o contato \"%s\"?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2275,7 +2280,11 @@ msgstr ""
 "Deseja realmente remover o contato agrupado \"%s\"? Note que isso irá "
 "remover todos os contatos que constituem este contato agrupado."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Removendo contato"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2286,23 +2295,23 @@ msgstr[1] "Meta-contatos contendo %u contatos"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Localização</b> em (data)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Conectado a partir de um celular ou dispositivo móvel"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova rede"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Escolha uma rede de IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Reiniciar a lista de _redes"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Selecionar"
@@ -2315,250 +2324,252 @@ msgstr "novo servidor"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Contatos agrupados"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Desagrupar..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"Divide completamente os meta-contatos exibidos nos contatos que ele contém."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Agrupar"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Desagrupar meta-contato \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Tem a certeza de que deseja desagrupar estes contatos? Isto irá separar os "
-"contatos vinculados em contatos separados."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Desconectar"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Histórico"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Mostrar"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Conversa em %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Conversa com %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s segundo"
 msgstr[1] "%s segundos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s minuto"
 msgstr[1] "%s minutos"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Chamada durou %s, encerrada às %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Hoje"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Qualquer hora"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Qualquer um"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Quem"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Quando"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Qualquer coisa"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Conversas de texto"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Chamadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Chamadas recebidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Chamadas realizadas"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Chamadas não atendidas"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "O que"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Tem certeza que deseja deletar todos os registros das conversas anteriores?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "_Limpar tudo"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Deletar de:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Carregando...</span>"
+msgid "_File"
+msgstr "Arquivo"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Bate-papo"
+#: ../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 "_Editar"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Deletar todo o histórico..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Vídeo"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Bate-papo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Editar"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Vídeo"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "Arquivo"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "página 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ID do contato:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Carregando...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "O contato está desconectado"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ba_te-papo"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "O contato especificado é inválido ou desconhecido"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Este tipo de conversa não é suportado por este contato"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "A funcionalidade solicitada não está implementada neste procotolo"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Não foi possível iniciar uma conversa com este contato"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Você foi banido deste canal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Este canal está cheio"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Você tem que ser convidado para entrar neste canal"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Não é possível prosseguir enquanto estiver desconectado"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Permissão negada"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Ocorreu um erro ao iniciar a conversa"
+
+#: ../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 "Digite um contato ou um número de telefone:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Nova conversa"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Enviar _vídeo"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "Chamada de _vídeo"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "Ch_amar"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Chamada de áudio"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nova chamada"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "A autenticação falhou na conta <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"
@@ -2595,12 +2606,8 @@ msgstr "Clique para fazer deste estado um favorito"
 msgid "Set status"
 msgstr "Definir estado"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Define sua presença e estado atual"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Mensagens personalizadas..."
 
@@ -2608,7 +2615,7 @@ msgstr "Mensagens personalizadas..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nova conta %s"
@@ -2618,20 +2625,20 @@ msgid "Find:"
 msgstr "Localizar:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Diferenciar _maiúsculas de minúsculas"
+msgid "_Previous"
+msgstr "_Anterior"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frase não encontrada"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Próxima"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Diferenciar _maiúsculas de minúsculas"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Anterior"
+msgid "Phrase not found"
+msgstr "Frase não encontrada"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2677,12 +2684,12 @@ msgstr "Chamada de voz finalizada"
 msgid "Edit Custom Messages"
 msgstr "Editar mensagens personalizadas"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Mensagem editada às %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2763,34 +2770,38 @@ msgid "Certificate hostname: %s"
 msgstr "Certificado da máquina: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Continuar"
+msgid "C_ontinue"
+msgstr "_Continuar"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Conexão não confiável"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Esta conexão não é confiável. Você quer continuar assim mesmo?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Lembrar esta escolha para conexões futuras"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalhes do certificado"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Não foi possível abrir o URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Selecionar um arquivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Espaço livre insuficiente para salvar o arquivo"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2799,7 +2810,7 @@ msgstr ""
 "É necessário %s de espaço livre para salvar este arquivo, mas apenas está "
 "disponível %s. Selecione outra localização."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Recebendo arquivo de %s"
@@ -2971,39 +2982,31 @@ msgstr "Ocidental"
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "O contato selecionado não pode receber arquivos."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "O contato selecionado está desconectado."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nenhuma mensagem de erro"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Mensageiro Instantâneo (Empathy)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Não conectar ao iniciar"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Não mostrar a lista de contatos ou qualquer outro diálogo ao iniciar"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Cliente de mensagens instantâneas Empathy"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Erro ao contatar o gerenciador de conta"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3049,11 +3052,11 @@ msgstr ""
 "Empathy; se não, escreva para a Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Um cliente de mensagens instantâneas para o GNOME"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Luiz Guaraldo <software.livre@terra.com.br>\n"
@@ -3064,231 +3067,90 @@ msgstr ""
 "Leonardo Ferreira Fontenelle <leonardof@gnome.org>\n"
 "Taylon Silmer <taylonsilva@gmail.com>\n"
 "Michel Recondo <michel@recondo.com.br>\n"
-"Jonh Wendell <wendell@bani.com.br>\n"
+"Jonh Wendell <jonh.wendell@gmail.com>\n"
 "Vladimir Melo <vmelo@gnome.org>\n"
 "André Gondim <andregondim@ubuntu.com>\n"
 "Henrique P. Machado <hpmachado@gnome.org>\n"
 "Felipe Borges <felipe10borges@gmail.com>\n"
 "Antonio Fernandes C. Neto <fernandesn@gnome.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Ocorreu um erro ao importar as contas."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Ocorreu um erro ao analisar os detalhes da conta."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Ocorreu um erro ao criar a conta."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Ocorreu um erro."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "A mensagem de erro foi: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Você pode voltar e tentar digitar os detalhes da sua conta novamente ou sair "
-"deste assistente e adicionar contas mais tarde pelo menu Editar."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Houve um erro"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Qual tipo de conta de bate-papo você possui?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Você possui alguma outra conta que deseja configurar?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Digite os detalhes da sua conta"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Qual tipo de conta de bate-papo você deseja criar?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Você deseja criar outras contas de bate-papo?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Digite os detalhes para a nova conta"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Com o Empathy você pode bater papo com pessoas online por perto e com amigos "
-"e colegas que usam Google Talk, AIM, Windows Live e muitos outros programas "
-"de bate-papo. Com um microfone ou uma webcam você poderá também ter chamadas "
-"de áudio ou vídeo."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Você possui uma conta que você usa com outro programa?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Sim, importe os detalhes da minha conta de "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Sim, eu digitarei os detalhes da minha conta agora"
-
-# Tooltip.
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Não, eu desejo criar uma nova conta"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Não, eu só desejo ver pessoas online por perto por agora"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Selecione as contas que você deseja importar:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Sim"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Não, por agora basta"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"O Empathy pode automaticamente descobrir e conversar com as pessoas "
-"conectadas na mesma rede que você. Se você quiser utilizar este recurso, por "
-"favor, verifique se os detalhes abaixo estão corretos. Você pode facilmente "
-"alterar estes detalhes depois ou desabilitar este recurso usando o diálogo "
-"\"Contas\" "
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Editar->Contas"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Eu _não quero habilitar este recurso agora"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Você não está habilitado a conversar com pessoas conectadas na sua rede "
-"local pelo fato do telepathy-salut não estar instalado. Se você quiser "
-"habilitar este recurso, por favor, instale o pacote telepathy-salut e crie "
-"uma nova conta Pessoas por perto no diálogo de Contas"
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "o telepathy-salut não está instalado"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Assistente de contas de mensagem e VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Bem-vindo ao Empathy"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Importe suas contas existentes"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Por favor, insira seus detalhes pessoais"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Existem modificações da sua conta %s que ainda não foram salvas."
 
 #. 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:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Sua nova conta ainda não foi salva."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Conectando..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Desconectado — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Desconectado — Nenhuma conexão de rede"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Status desconhecido"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Esta conta foi desabilitada porque ela depende de um backend muito antigo, "
+"que não é mais suportado. Por favor, instale o pacote telepathy-haze e "
+"reinicie sua sessão para efetuar a migração da conta."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Desconectado — Conta desabilitada"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Você está prestes a criar uma nova conta, o que descartará\n"
-"suas modificações. Você tem certeza que deseja prosseguir?"
+#: ../src/empathy-accounts-dialog.c:574
+msgid "Edit Connection Parameters"
+msgstr "Editar os parâmetros de conexão"
+
+#: ../src/empathy-accounts-dialog.c:739
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Falha ao recuperar sua informação pessoal do servidor."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:745
+msgid "Go online to edit your personal information."
+msgstr "Conecte-se para editar sua informação pessoal."
+
+#: ../src/empathy-accounts-dialog.c:830
+msgid "_Edit Connection Parameters..."
+msgstr "_Editar os parâmetros de conexão..."
+
+#: ../src/empathy-accounts-dialog.c:1326
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Você deseja remover %s do seu computador?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1330
 msgid "This will not remove your account on the server."
 msgstr "Isso não removerá sua conta no servidor."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1566
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3297,39 +3159,43 @@ msgstr ""
 "suas modificações. Você tem certeza que deseja prosseguir?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1742
 msgid "_Enable"
 msgstr "_Habilitar"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1743
 msgid "_Disable"
 msgstr "_Desabilitar"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Skip"
+msgstr "_Pular"
+
+#: ../src/empathy-accounts-dialog.c:2130
+msgid "_Connect"
+msgstr "_Conectar"
+
+#: ../src/empathy-accounts-dialog.c:2307
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr ""
 "Você está prestes a fechar a janela, o que descartará\n"
-"suas modificações. Você tem certeza que deseja prosseguir?"
+"suas modificações. Tem certeza que deseja prosseguir?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Add…"
 msgstr "_Adicionar…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Carregando informações de conta"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nenhum protocolo instalado"
+msgid "_Import…"
+msgstr "_Importar…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protocolo:"
+msgid "Loading account information"
+msgstr "Carregando informações de conta"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3337,132 +3203,116 @@ msgstr ""
 "Para adicionar uma nova conta, é necessário primeiro instalar um backend "
 "para cada protocolo que você deseja usar."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importar…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Nenhum protocolo instalado"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Cliente de autenticação do Empathy"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Cliente de autenticação do Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Pessoas por perto"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Cliente de áudio/vídeo do Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Cliente de áudio/vídeo do Empathy"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Contraste"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Brilho"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Volume"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Painel lateral"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Entrada de áudio"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Entrada de vídeo"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Teclado"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detalhes"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1782
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Chamada de %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "O endereço IP como visto pela máquina"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "O endereço IP como visto por um servidor na Internet"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "O endereço IP do par como visto pelo outro lado"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "O endereço IP de um servidor de retransmissão"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "O endereço IP do grupo de multicast"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Desconhecido"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Desconhecido"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Desconhecido"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Conectado — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Detalhes técnicos"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3471,8 +3321,8 @@ msgstr ""
 "O aplicativo %s não reconhece nenhum dos formatos de áudio com suporte em "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3481,8 +3331,8 @@ msgstr ""
 "O aplicativo %s não reconhece nenhum dos formatos de vídeo com suporte em "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3491,29 +3341,29 @@ msgstr ""
 "Não foi possível realizar uma conexão para %s. Você deve estar em uma rede "
 "que não permite conexões diretas."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Ocorreu uma falha de rede"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos de áudio necessários para esta chamada não estão instalados no "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos de vídeo necessários para esta chamada não estão instalados no "
 "seu computador"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3524,262 +3374,310 @@ msgstr ""
 "\"%s\">reporte este erro</a> e anexe os registros gerados na janela "
 "\"Depuração\" no menu Ajuda."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Ocorreu uma falha no mecanismo de chamada"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Alcançado o fim do fluxo"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Não foi possível realizar uma transmissão de áudio"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Não foi possível realizar uma transmissão de vídeo"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Áudio"
+msgid "_Call"
+msgstr "_Chamar"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Codec de decodificação:"
+msgid "_Microphone"
+msgstr "_Microfone"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "_Desabilitar câmera"
+msgid "_Camera"
+msgstr "_Câmera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Exibir o teclado"
+msgid "_Settings"
+msgstr "_Configuraçõess"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Codec de codificação:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Ver"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Desligar"
+#: ../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 "Aj_uda"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Desligar a chamada atual"
+#: ../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 "_Sumário"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Apresentação local:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Depuração"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximizar-me"
+msgid "Swap camera"
+msgstr "Trocar a câmera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimizar-me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Apresentação remota:"
+msgid "Maximise me"
+msgstr "Maximizar-me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Enviar áudio"
+msgid "Disable camera"
+msgstr "_Desabilitar câmera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Enviar _vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Desligar"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Mostrar teclado"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Desligar a chamada atual"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Chamada de vídeo"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Iniciar uma chamada de vídeo"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Iniciar uma chamada de áudio"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Trocar a câmera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Alternar transmissão de áudio"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Alternar transmissão de vídeo"
+msgid "Show dialpad"
+msgstr "Mostrar teclado"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
-msgid "Unknown"
-msgstr "Desconhecido"
+msgid "Display the dialpad"
+msgstr "Exibir o teclado"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Enviar _vídeo"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Chamada de vídeo"
+msgid "Toggle video transmission"
+msgstr "Alternar transmissão de vídeo"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Chamar"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Enviar áudio"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Câmera"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Sumário"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Alternar transmissão de áudio"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Depuração"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Codec de codificação:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Aj_uda"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Codec de decodificação:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Microfone"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Apresentação remota:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Configuraçõess"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Apresentação local:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Ver"
+msgid "Audio"
+msgstr "Áudio"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Fechar esta janela?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Ao fechar esta janela você sairá de %s. Você não receberá mais nenhuma "
+"mensagem até que entre novamente."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Ao fechar esta janela você sairá de 1 sala de bate-papo. Você não receberá "
+"mais nenhuma mensagem até que entre novamente."
+msgstr[1] ""
+"Ao fechar esta janela você sairá de %u salas de bate-papo. Você não receberá "
+"mais nenhuma mensagem até que entre novamente nelas."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Sair de %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Você não receberá mais nenhuma mensagem desta sala até que entre novamente."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Fechar a janela"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Sair da sala"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d não lida)"
 msgstr[1] "%s (%d não lidas)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (e %u outro)"
 msgstr[1] "%s (e %u outros)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d não lido de outros)"
 msgstr[1] "%s (%d não lido de outros)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d não lido de todos)"
 msgstr[1] "%s (%d não lido de todos)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Enviando %d mensagem"
 msgstr[1] "Enviando %d mensagens"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Digitando uma mensagem."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Limpar"
+msgid "_Conversation"
+msgstr "_Conversa"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "C_ontato"
+msgid "C_lear"
+msgstr "_Limpar"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Inserir _smiley"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Marcar sala de bate-papo como _favorita"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Convidar _participante..."
+msgid "Notify for All Messages"
+msgstr "Notificar todas as mensagens"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Mover aba para a _esquerda"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Mostrar lista de contatos"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Mover aba para a _direita"
+msgid "Invite _Participant…"
+msgstr "Convidar _participante..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notificar todas as mensagens"
+msgid "C_ontact"
+msgstr "C_ontato"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Conversa"
+msgid "_Tabs"
+msgstr "_Abas"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Destacar aba"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Marcar sala de bate-papo como _favorita"
+msgid "_Previous Tab"
+msgstr "Aba _anterior"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Próxima aba"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "Aba _anterior"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Desfazer fechar aba"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Mostrar lista de contatos"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Mover aba para a _esquerda"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Abas"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Mover aba para a _direita"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Desfazer fechar aba"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Destacar aba"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3793,100 +3691,100 @@ msgstr "Sala"
 msgid "Auto-Connect"
 msgstr "Conectar automaticamente"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Gerenciar salas favoritas"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Recebendo chamada de vídeo"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Recebendo chamada"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s está chamando você via vídeo, você quer responder?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s está chamando você, você quer responder?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../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 "Recebendo chamada de %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Rejeitar"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "R_esponder"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Responder com vídeo"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../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 "Recebendo chamada de vídeo de %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Convite de sala"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Convite para entrar em %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s está convidando você para entrar em %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Recusar"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "E_ntrar"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s o convidou para entrar em %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Você foi convidado para entrar em %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Recebendo transferência de arquivo de %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Senha requerida"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s gostaria de ter permissão para ver quando vocês estiver online"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3897,106 +3795,106 @@ msgstr ""
 
 # Esperando comentário do desenvolvedor explicando o que é a mensagem.
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 # Esperando comentário do desenvolvedor explicando o que é a mensagem.
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s de %s em %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Recebendo \"%s\" de %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Enviando \"%s\" para %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Erro recebendo \"%s\" de %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Erro recebendo arquivo"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Erro enviando \"%s\" para %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Erro enviando arquivo"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" recebido de %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" enviado para %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Transferência de arquivo concluída"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Aguardando a resposta do outro participante"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Verificando integridade de \"%s\""
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Fazendo hash de \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Arquivo"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Restando"
 
@@ -4008,7 +3906,11 @@ msgstr "Transferências de arquivo"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Remove transferências concluídas, canceladas e falhas da lista"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importar"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3918,198 @@ msgstr ""
 "Nenhuma conta para importar pôde ser localizada. Atualmente o Empathy só tem "
 "suporte a importar contas do Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importar contas"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importar"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Origem"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Forneça a senha"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Desconectar"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Você precisa adicionar uma conta para ver seus contatos aqui."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nenhuma correspondência encontrada"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Desculpe, mas contas de %s só podem ser usadas quando seu software %s for "
+"atualizado."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Atualizar software..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Fechar"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Reconectar"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Editar conta"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Fechar"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Recarregar %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Recarregar os créditos da conta"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Recarregar..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Contato"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Você precisa habilitar pelo menos uma conta para ver seus contatos aqui."
+
+#. 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 "Você precisa habilitar a conta %s para ver seus contatos aqui."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Lista de contatos"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Contatos no _mapa"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Configurações das contas"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Créditos"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nova conversa..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Procurar na _lista de contatos"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nova _chamada..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Entrar em _favoritos"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Procurar por contatos…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Gerenciar favoritos"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Transferências de arquivos"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Tamanho no_rmal"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Contatos _desconectados"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nova _chamada..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Exibir p_rotocolos"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Tamanho normal com _avatares"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Créditos"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Contatos no _mapa"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "Cont_as"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "Contatos _bloqueados"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "P_referências"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Exibir p_rotocolos"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Procurar na _lista de contatos"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Ordenar por _nome"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Ordenar por _status"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "Cont_as"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Tamanho normal com _avatares"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "Contatos _bloqueados"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Tamanho no_rmal"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "Tamanho _compacto"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Transferências de arquivos"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Sala"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "E_ntrar..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nova conversa..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Contatos _desconectados"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Informação _pessoal"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Sala"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Entrar em _favoritos"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Procurar por contatos…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Gerenciar favoritos"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Sala de bate-papo"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Membros"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4122,27 @@ msgstr ""
 "Senha requerida: %s\n"
 "Membros: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Sim"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Não"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Não é possível iniciar a listagem de salas"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Não foi possível parar a listagem de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Não foi possível carregar lista de salas"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Entrar na sala"
 
 # Tooltip, but imperative sentence is correct.
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
@@ -4218,8 +4152,13 @@ msgstr ""
 "Digite o nome da sala em que você deseja entrar aqui ou clique em uma sala "
 "ou mais na lista."
 
-# Tooltip, but imperative sentence is correct.
+# Evitar colisão com _Salvar
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "Sa_la:"
+
+# Tooltip, but imperative sentence is correct.
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4227,375 +4166,395 @@ msgstr ""
 "Digite o servidor que hospeda a sala, ou deixe o campo vazio caso a sala "
 "esteja no servidor da conta atual"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Entrar na sala"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Não foi possível carregar lista de salas"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Lista de salas"
 
-# Evitar colisão com _Salvar
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "Sa_la:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Mensagem recebida"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Nova conversa"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "O contato está conectado"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "Um contato se conecta"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "O contato está desconectado"
+msgstr "Um contato se desconecta"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
-msgstr "Conta conectada"
+msgstr "Uma conta se conecta"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
-msgstr "Conta desconectada"
+msgstr "Uma conta se desconecta"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Idioma"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julieta"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeu"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ó Romeu, Romeu, porque haverias de ser tu, Romeu?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Renega o teu pai e recusa o teu nome;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Ou se não queres, jura-me que me amas"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "E deixarei de ser um Capuleto."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Devo continuar a ouvi-la, ou posso falar agora?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julieta desconectou"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Preferências"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Mostrar _smileys como imagens"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "_Mostrar lista de contatos nas salas"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Aparência"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Comportamento"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Iniciar bate-papos em:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "T_ema do bate-papo:"
+msgid "new ta_bs"
+msgstr "nova _aba"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Desabilitar notificações quando ausente ou _ocupado"
+msgid "new _windows"
+msgstr "nova _janela"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Desabilitar sons quando _ausente ou ocupado"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Exibir eventos recebidos na área de notificação"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Conectar automati_camente ao iniciar "
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Cancelamento de eco ajuda a produzir o som de sua voz mais claro para a "
-"outra pessoa, mas pode causar problemas em alguns computadores. Se você ou a "
-"outra pessoa ouvir barulhos estranhos ou falhas durante as chamadas, tente "
-"desligar o cancelamento de eco e reiniciar a chamada."
+msgid "Log conversations"
+msgstr "Registro de conversas"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Habilitar notificações quando um contato conectar"
+msgid "Behavior"
+msgstr "Comportamento"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Habilitar notificações quando um contato desconectar"
+msgid "General"
+msgstr "Geral"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
+msgid "_Enable bubble notifications"
+msgstr "Ha_bilitar balões de notificação"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Habilitar verificação ortográfica para os idiomas:"
+msgid "Disable notifications when _away or busy"
+msgstr "Desabilitar notificações quando ausente ou _ocupado"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Geral"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Exibir notificações quando o bate-papo não estiver em _foco"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Nível de entrada:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Habilitar notificações quando um contato conectar"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Volume de entrada:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Habilitar notificações quando um contato desconectar"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Notificações"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Fontes de localização:"
+msgid "_Enable sound notifications"
+msgstr "H_abilitar sons de notificação"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Registro de conversas"
+msgid "Disable sounds when _away or busy"
+msgstr "Desabilitar sons quando _ausente ou ocupado"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Notificações"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Reproduzir sons para eventos"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Sons"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privacidade"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Usar cancelamento de _echo para melhorar a qualidade da chamada"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Redução da precisão da localização significa que nada mais preciso do que a "
-"sua cidade, estado e país serão publicados. As coordenadas do GPS terão a "
-"precisão de 1 casa decimal."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Mostrar _smileys como imagens"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "_Mostrar lista de contatos nas salas"
+"Cancelamento de eco ajuda a produzir o som de sua voz mais claro para a "
+"outra pessoa, mas pode causar problemas em alguns computadores. Se você ou a "
+"outra pessoa ouvir barulhos estranhos ou falhas durante as chamadas, tente "
+"desligar o cancelamento de eco e reiniciar a chamada."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Sons"
+msgid "_Publish location to my contacts"
+msgstr "_Publicar a localização para os meus contatos"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Verificação de ortografia"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"A lista de idiomas representa somente os idiomas para os quais você já "
-"possui dicionários instalados."
+"Redução da precisão da localização significa que nada mais preciso do que a "
+"sua cidade, estado e país serão publicados. As coordenadas do GPS terão a "
+"precisão de 1 casa decimal."
 
+#. 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 "Themes"
-msgstr "Temas"
+msgid "_Reduce location accuracy"
+msgstr "_Reduzir a precisão de localização"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Variante:"
+msgid "Privacy"
+msgstr "Privacidade"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "Conectar automati_camente ao iniciar "
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "Telefone _celular"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "Ha_bilitar balões de notificação"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Rede (IP, Wi-Fi)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "H_abilitar sons de notificação"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Fontes de localização:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Rede (IP, Wi-Fi)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"A lista de idiomas representa somente os idiomas para os quais você já "
+"possui dicionários instalados."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Abrir novos bate-papos em janelas separadas"
+msgid "Enable spell checking for languages:"
+msgstr "Habilitar verificação ortográfica para os idiomas:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "_Publicar a localização para os meus contatos"
+msgid "Spell Checking"
+msgstr "Verificação de ortografia"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "T_ema do bate-papo:"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "_Reduzir a precisão de localização"
+msgid "Variant:"
+msgstr "Variante:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Temas"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Sai_r"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Chamar o contato novamente"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Câmera desligada"
+msgid "Redial"
+msgstr "Rediscar"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Câmera ligada"
+msgid "V_ideo"
+msgstr "V_ídeo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Vídeo desligado"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Desabilitar a câmera e parar o envio de vídeo"
+msgid "Video Preview"
+msgstr "Visualização de vídeo"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Habilitar a câmera e enviar vídeo"
+msgid "Video On"
+msgstr "Vídeo ligado"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Habilitar a câmera, mas não enviar vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Chamar o contato novamente"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Pré-visualizar"
+msgid "Camera Off"
+msgstr "Câmera desligada"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Rediscar"
+msgid "Disable camera and stop sending video"
+msgstr "Desabilitar a câmera e parar o envio de vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ídeo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Pré-visualizar"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Vídeo desligado"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Habilitar a câmera, mas não enviar vídeo"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Vídeo ligado"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Câmera ligada"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Visualização de vídeo"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Habilitar a câmera e enviar vídeo"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Visualização do mapa de contatos"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Salvar"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Link do pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Resposta do pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Dados grandes demais para um único post. Salve os logs em um arquivo."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Enviar para o pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Depuração"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informações"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Crítico"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domínio"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Categoria"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nível"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4603,168 +4562,349 @@ msgstr ""
 "O gerenciador de conexões selecionado não suporta a extensão de depuração "
 "remota."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Convidar participante"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Escolha um contato para convidar para a conversa:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Convidar"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Não exibe nenhuma tela; faz todo o trabalho (ex: importa) e sai"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Não mostrar quaisquer diálogos exceto se apenas existirem contas \"Pessoas "
 "por perto\""
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Seleciona inicialmente uma conta fornecida (ex: gabble/jabber/"
 "por_exemplo_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id da conta>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Contas do Empathy"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Contas do Empathy"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Mostrar um determinado serviço"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "- Depurador Empathy"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Depurador do Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Cliente de mensagens instantâneas Empathy"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Rejeitar"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Responder"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Responder com vídeo"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Recusar"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Aceitar"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Proporcionar"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s tentou te ligar enquanto você estava em outra chamada."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Em espera"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Mudo"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Duração"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Seu saldo atual é %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Desculpe, você não possui créditos suficientes para esta chamada."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Voltar"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "Diferenciar _maiúsculas/minúsculas"
 
-#~ msgid "Find Next"
-#~ msgstr "Procurar próximo"
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Qual tipo de conta de bate-papo você possui?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Adicionando uma nova conta"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Pessoas por perto"
+
+#: ../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."
+msgstr ""
+"O Empathy pode automaticamente descobrir e conversar com as pessoas "
+"conectadas na mesma rede que você. Se você quiser utilizar este recurso, por "
+"favor, verifique se os detalhes abaixo estão corretos."
+
+#: ../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 ""
+"Você pode alterar estes detalhes depois ou desabilitar este recurso através "
+"da opção <span style=\"italic\">Editar → Contas</span> na lista de contatos."
+
+#~ msgid "Call volume"
+#~ msgstr "Volume da chamada"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Volume de chamada, como uma porcentagem."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "O Empathy migrou os registros do butterfly"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Pergunta sobre migrar os registros do butterfly."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Tipo de soquete sem suporte"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Minhas contas web"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "A conta %s é editada através do %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "A conta %s não pode ser editada no Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Iniciar Minhas contas web"
+
+#~ msgid "Edit %s"
+#~ msgstr "Editar %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Cancelar"
+
+#~ msgid "Personal Information"
+#~ msgstr "Informações pessoais"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Sem grupo"
+
+#~ msgid "Favorite People"
+#~ msgstr "Amigos prediletos"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "_Editar"
+
+#~ msgid "Select a contact"
+#~ msgstr "Selecionar contato..."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Contatos agrupados"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Selecionar contato para agrupar"
+
+#~ msgid "New contact preview"
+#~ msgstr "Visualização de novo contato"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr ""
+#~ "Contatos selecionados na lista da esquerda serão conectados todos juntos."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "Agr_upar contatos…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Contatos agrupados"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Desagrupar..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "Divide completamente os meta-contatos exibidos nos contatos que ele "
+#~ "contém."
+
+#~ msgid "_Link"
+#~ msgstr "_Agrupar"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Desagrupar meta-contato \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Tem a certeza de que deseja desagrupar estes contatos? Isto irá separar "
+#~ "os contatos vinculados em contatos separados."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Desconectar"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ID do contato:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ba_te-papo"
+
+#~ msgid "Send _Video"
+#~ msgstr "Enviar _vídeo"
+
+#~ msgid "C_all"
+#~ msgstr "Ch_amar"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Define sua presença e estado atual"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "O contato selecionado não pode receber arquivos."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "O contato selecionado está desconectado."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Ocorreu um erro ao importar as contas."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Ocorreu um erro ao analisar os detalhes da conta."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Ocorreu um erro ao criar a conta."
+
+#~ msgid "There was an error."
+#~ msgstr "Ocorreu um erro."
 
-#~ msgid "Find Previous"
-#~ msgstr "Procurar para trás"
+#~ msgid "The error message was: %s"
+#~ msgstr "A mensagem de erro foi: %s"
 
-#~ msgid "Show and edit accounts"
-#~ msgstr "Mostrar e editar contas"
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Você pode voltar e tentar digitar os detalhes da sua conta novamente ou "
+#~ "sair deste assistente e adicionar contas mais tarde pelo menu Editar."
 
-#~ msgid "Call with %d participants"
-#~ msgstr "Chamada com %d participantes"
+#~ msgid "An error occurred"
+#~ msgstr "Houve um erro"
 
-#~ msgid "All"
-#~ msgstr "Todos"
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Você possui alguma outra conta que deseja configurar?"
 
-#~ msgid "_Enabled"
-#~ msgstr "_Habilitado"
+#~ msgid "Enter your account details"
+#~ msgstr "Digite os detalhes da sua conta"
 
-#~ msgid "Date"
-#~ msgstr "Data"
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Qual tipo de conta de bate-papo você deseja criar?"
 
-#~ msgid "Conversations"
-#~ msgstr "Conversas"
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Você deseja criar outras contas de bate-papo?"
 
-#~ msgid "Previous Conversations"
-#~ msgstr "Conversas anteriores"
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Digite os detalhes para a nova conta"
 
-#~ msgid "_For:"
-#~ msgstr "_Por:"
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Com o Empathy você pode bater papo com pessoas online por perto e com "
+#~ "amigos e colegas que usam Google Talk, AIM, Windows Live e muitos outros "
+#~ "programas de bate-papo. Com um microfone ou uma webcam você poderá também "
+#~ "ter chamadas de áudio ou vídeo."
 
-#~ msgid "Enter Custom Message"
-#~ msgstr "Digite a mensagem personalizada"
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Você possui uma conta que você usa com outro programa?"
 
-#~ msgid "Save _New Status Message"
-#~ msgstr "Salvar _nova mensagem de status"
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Sim, importe os detalhes da minha conta de "
 
-#~ msgid "Saved Status Messages"
-#~ msgstr "Salvar mensagens de status"
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Sim, eu digitarei os detalhes da minha conta agora"
diff --git a/po/ru.po b/po/ru.po
index 58424a1a3..d2be513a3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -12,8 +12,8 @@ msgid ""
 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: 2011-12-22 11:35+0000\n"
-"PO-Revision-Date: 2012-01-07 20:04+0300\n"
+"POT-Creation-Date: 2012-03-06 15:16+0000\n"
+"PO-Revision-Date: 2012-03-07 18:21+0300\n"
 "Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
 "Language-Team: Russian <gnome-cyr@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,430 +25,454 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Общайтесь в Google Talk, Facebook, MSN и во многих других службах"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Клиент обмена мгновенными сообщениями"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Программа обмена сообщениями Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Клиент обмена мгновенными сообщениями"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Общайтесь в Google Talk, Facebook, MSN и во многих других службах"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Учётные записи обмена сообщениями и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управление учётными записями для обмена сообщениями и VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Всегда открывать новую беседу в новом окне."
+msgid "Connection managers should be used"
+msgstr "Используемые диспетчеры соединений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Камера"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Использовать ли менеджеры связности для автоматического отключения или переподключения."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Положение камеры"
+msgid "Empathy should auto-connect on startup"
+msgstr "Присоединяться при запуске"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Символ для добавления после псевдонима, если в беседе используется автодополнение псевдонимов по клавише Tab."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Должен ли Empathy автоматически входить в ваши учётные записи при запуске."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Тема окна беседы"
+msgid "Empathy should auto-away when idle"
+msgstr "Устанавливать статус «отсутствует» при бездействии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Вариант тема для окна беседы"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Должен ли Empathy автоматически устанавливать статус «отсутствует» при бездействии пользователя."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Список языков, используемых при проверке орфографии, разделённых запятыми (например «en, fr, ru»)."
+msgid "Empathy default download folder"
+msgstr "Папка Empathy для загрузки файлов"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Компактный список собеседников"
+msgid "The default folder to save file transfers in."
+msgstr "Каталог по умолчанию для сохранения присланных файлов."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Используемые диспетчеры соединений"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Магическое число, используемое для проверки того, нужно ли запустить задачи по очистке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Критерий упорядочивания списка собеседников"
+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."
+msgstr "empathy-sanity-cleaning.c использует это число для проверки, нужно ли запустить задачи по очистке. Пользователи не должны изменять вручную значение этого ключа."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Путь к объекту D-Bus последней учётной записи, выбранной для присоединения к комнате."
+msgid "Show offline contacts"
+msgstr "Показывать собеседников не в сети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Камера, используемая по умолчанию для видеовызовов, напр. /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Показывать ли собеседников не в сети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Каталог, используемый для выбора изображений аватаров"
+msgid "Show avatars"
+msgstr "Показывать аватары"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Выключить всплывающие уведомления в состоянии «отсутствует»"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Показывать ли аватары собеседников в списке собеседников и окнах беседы."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Выключить звуки в состоянии «отсутствует»"
+msgid "Show protocols"
+msgstr "Показывать протоколы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Показывать наступающие события в области состояния"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Показывать ли протоколы для собеседников в списке собеседников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Показывать наступающие события в области состояния. Если ключ не установлен, показывать их непосредственно пользователю."
+msgid "Show Balance in contact list"
+msgstr "Показывать баланс в списке собеседников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Поддержка подавления эха"
+msgid "Whether to show account balances in the contact list."
+msgstr "Показывать ли балансы учётных записей в списке собеседников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy может публиковать местоположение пользователя"
+msgid "Compact contact list"
+msgstr "Компактный список собеседников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy может использовать GPS для определения местоположения"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Показывать ли компактный список собеседников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy может использовать сотовую сеть для определения местоположения"
+msgid "Hide main window"
+msgstr "Скрывать главное окно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy может использовать сеть для определения местоположения"
+msgid "Hide the main window."
+msgstr "Скрывать главное окно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Папка Empathy для загрузки файлов"
+msgid "Default directory to select an avatar image from"
+msgstr "Каталог, используемый для выбора изображений аватаров"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Устанавливать статус «отсутствует» при бездействии"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Последний каталог, из которого выбирались изображения аватаров."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Присоединяться при запуске"
+msgid "Open new chats in separate windows"
+msgstr "Открывать новые беседы в новом окне"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy должен снижать точность местоположения"
+msgid "Always open a separate chat window for new chats."
+msgstr "Всегда открывать новую беседу в новом окне."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy должен использовать аватар контакта как значок окна с беседой"
+msgid "Display incoming events in the status area"
+msgstr "Показывать наступающие события в области состояния"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Включить инструменты разработчика WebKit"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Показывать наступающие события в области состояния. Если ключ не установлен, показывать их непосредственно пользователю."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Включить всплывающие уведомления о новых сообщениях"
+msgid "The position for the chat window side pane"
+msgstr "Положение боковой панели окна беседы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Включить проверку орфографии"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Положение боковой панели окна беседы (в пикселах)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Скрывать главное окно"
+msgid "Show contact groups"
+msgstr "Показывать группы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Скрывать главное окно."
+msgid "Whether to show groups in the contact list."
+msgstr "Показывать ли группы в списке собеседников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Последняя учётная запись, выбранная в диалоге присоединения к комнате."
+msgid "Contact list sort criterion"
+msgstr "Критерий упорядочивания списка собеседников"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Символ автодополнения псевдонима"
+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 "Критерий упорядочивания списка собеседников. По умолчанию упорядочивается по статусу («state»); «name» — упорядочивать по имени собеседника."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Открывать новые беседы в новом окне"
+msgid "Use notification sounds"
+msgstr "Использовать звуки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Путь к используемой теме Adium"
+msgid "Whether to play a sound to notify of events."
+msgstr "Воспроизводить ли звук для уведомления о событиях."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Путь к используемой теме Adium, если тема, используемая для беседы — Adium."
+msgid "Disable sounds when away"
+msgstr "Выключить звуки в состоянии «отсутствует»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Воспроизводить ли звук при получении сообщения"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Воспроизводить ли звуковые уведомления в состояниях «отсутствует» или «не беспокоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Воспроизводить ли звук при начале беседы"
+msgid "Play a sound for incoming messages"
+msgstr "Воспроизводить ли звук при получении сообщения"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Воспроизводить ли звук при отправке сообщения"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Воспроизводить ли звук для уведомления о входящих сообщениях."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Воспроизводить ли звук при входе контакта в сеть"
+msgid "Play a sound for outgoing messages"
+msgstr "Воспроизводить ли звук при отправке сообщения"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Воспроизводить ли звук при выходе контакта из сети"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Воспроизводить ли звук для уведомления об исходящих сообщениях."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Воспроизводить звук при входе в сеть"
+msgid "Play a sound for new conversations"
+msgstr "Воспроизводить ли звук при начале беседы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Воспроизводить звук при выходе из сети"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Воспроизводить ли звук для уведомления о начале новой беседы."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Показывать всплывающие уведомления, если беседа находится не в фокусе"
+msgid "Play a sound when a contact logs in"
+msgstr "Воспроизводить ли звук при входе контакта в сеть"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Показывать всплывающие уведомления, когда появляется собеседник"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Воспроизводить ли звук для уведомления о входе собеседников в сеть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Показывать всплывающие уведомления, когда собеседник уходит"
+msgid "Play a sound when a contact logs out"
+msgstr "Воспроизводить ли звук при выходе контакта из сети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Предварительный просмотр положения камеры должен выполняться в течение вызова."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Воспроизводить ли звук для уведомления о выходе собеседников из сети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Показывать баланс в списке собеседников"
+msgid "Play a sound when we log in"
+msgstr "Воспроизводить звук при входе в сеть"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Показывать аватары"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Воспроизводить ли звук при входе в сеть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Показывать список собеседников в комнатах"
+msgid "Play a sound when we log out"
+msgstr "Воспроизводить звук при выходе из сети"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Показывать подсказку о закрытии главного окна"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Воспроизводить ли звук при выходе из сети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Показывать отсутствующих собеседников"
+msgid "Enable popup notifications for new messages"
+msgstr "Включить всплывающие уведомления о новых сообщениях"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Показывать протоколы"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Показывать ли всплывающее уведомление при получении нового сообщения."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Языки для проверки орфографии"
+msgid "Disable popup notifications when away"
+msgstr "Выключить всплывающие уведомления в состоянии «отсутствует»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Каталог по умолчанию для сохранения присланных файлов."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Показывать ли всплывающие уведомления в состояниях «отсутствует» или «не беспокоить»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Последний каталог, из которого выбирались изображения аватаров."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Показывать всплывающие уведомления, если беседа находится не в фокусе"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Положение боковой панели окна беседы"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Показывать ли всплывающее уведомление о получении нового сообщения, когда беседа уже ведётся, но не находится в фокусе."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Положение боковой панели окна беседы (в пикселах)."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Показывать всплывающие уведомления, когда появляется собеседник"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Эта тема используется для отображения диалога в окне беседы."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит в сеть."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Вариант темы, используемый для отображения бесед."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Показывать всплывающие уведомления, когда собеседник уходит"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Использовать графические улыбки"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит из сети."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Использовать звуки"
+msgid "Use graphical smileys"
+msgstr "Использовать графические улыбки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Использовать тему для бесед"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические изображения."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Может ли Empathy публиковать местоположение пользователя для его собеседников."
+msgid "Show contact list in rooms"
+msgstr "Показывать список собеседников в комнатах"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Может ли Empathy использовать GPS для определения местоположения."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Показывать ли список собеседников в комнатах."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Может ли Empathy использовать сотовую сеть для определения местоположения."
+msgid "Chat window theme"
+msgstr "Тема окна беседы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Может ли Empathy использовать сеть для определения местоположения."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Эта тема используется для отображения диалога в окне беседы."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Должен ли Empathy автоматически входить в ваши учётные записи при запуске."
+msgid "Chat window theme variant"
+msgstr "Вариант тема для окна беседы"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Должен ли Empathy автоматически устанавливать статус «отсутствует» при бездействии пользователя."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Вариант темы, используемый для отображения бесед."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Должен ли Empathy уменьшать точность определения местоположения по причинам приватности."
+msgid "Path of the Adium theme to use"
+msgstr "Путь к используемой теме Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Использовать ли аватар собеседника в качестве значка окна беседы."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Путь к используемой теме Adium, если тема, используемая для беседы — Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Должны ли быть включены инструменты разработчика WebKit, например Web Inspector."
+msgid "Enable WebKit Developer Tools"
+msgstr "Включить инструменты разработчика WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Использовать ли менеджеры связности для автоматического отключения или переподключения."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Должны ли быть включены инструменты разработчика WebKit, например Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Проверять ли введённые слова из списка языков для проверки орфографии."
+msgid "Inform other users when you are typing to them"
+msgstr "Уведомлять пользователей о наборе сообщений"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Преобразовывать ли текстовые улыбки (смайлы) в беседах в графические изображения."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Посылать ли уведомления о наборе сообщений. Не используется при статусе «Отошёл»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Включить ли фильтр подавления эха Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Использовать тему для бесед"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Воспроизводить ли звук для уведомления о входе собеседников в сеть."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Использовать ли темы для комнат."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Воспроизводить ли звук для уведомления о выходе собеседников из сети."
+msgid "Spell checking languages"
+msgstr "Языки для проверки орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Воспроизводить ли звук для уведомления о событиях."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Список языков, используемых при проверке орфографии, разделённых запятыми (например «en, fr, ru»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Воспроизводить ли звук для уведомления о входящих сообщениях."
+msgid "Enable spell checker"
+msgstr "Включить проверку орфографии"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Воспроизводить ли звук для уведомления о начале новой беседы."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Проверять ли введённые слова из списка языков для проверки орфографии."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Воспроизводить ли звук для уведомления об исходящих сообщениях."
+msgid "Nick completed character"
+msgstr "Символ автодополнения псевдонима"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Воспроизводить ли звук при входе в сеть."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Символ для добавления после псевдонима, если в беседе используется автодополнение псевдонимов по клавише Tab."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Воспроизводить ли звук при выходе из сети."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy должен использовать аватар контакта как значок окна с беседой"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Воспроизводить ли звуковые уведомления в состояниях «отсутствует» или «не беспокоить»."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Использовать ли аватар собеседника в качестве значка окна беседы."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит из сети."
+msgid "Last account selected in Join Room dialog"
+msgstr "Последняя учётная запись, выбранная в диалоге присоединения к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Показывать ли всплывающее уведомление, когда собеседник выходит в сеть."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Путь к объекту D-Bus последней учётной записи, выбранной для присоединения к комнате."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Показывать ли всплывающее уведомление о получении нового сообщения, когда беседа уже ведётся, но не находится в фокусе."
+msgid "Camera device"
+msgstr "Камера"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Показывать ли всплывающее уведомление при получении нового сообщения."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Камера, используемая по умолчанию для видеовызовов, напр. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Показывать ли балансы учётных записей в списке собеседников."
+msgid "Camera position"
+msgstr "Положение камеры"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Показывать ли аватары собеседников в списке собеседников и окнах беседы."
+msgid "Position the camera preview should be during a call."
+msgstr "Предварительный просмотр положения камеры должен выполняться в течение вызова."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Показывать ли собеседников не в сети."
+msgid "Echo cancellation support"
+msgstr "Поддержка подавления эха"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Показывать ли всплывающие уведомления в состояниях «отсутствует» или «не беспокоить»."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Включить ли фильтр подавления эха Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Показывать ли протоколы для собеседников в списке собеседников."
+msgid "Show hint about closing the main window"
+msgstr "Показывать подсказку о закрытии главного окна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Показывать ли список собеседников в комнатах."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Показывать ли диалоговое окно при закрытии главного окна с помощью кнопки «x» в строке заголовка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Показывать ли компактный список собеседников."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy может публиковать местоположение пользователя"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Показывать ли диалоговое окно при закрытии главного окна с помощью кнопки «x» в строке заголовка."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Может ли Empathy публиковать местоположение пользователя для его собеседников."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Использовать ли темы для комнат."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy может использовать сеть для определения местоположения"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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."
-msgstr "Критерий упорядочивания списка собеседников. По умолчанию упорядочивается по имени собеседника — «name». При значении «state» список будет упорядочен по статусу."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Может ли Empathy использовать сеть для определения местоположения."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управление учётными записями для обмена сообщениями и VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy может использовать сотовую сеть для определения местоположения"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Учётные записи обмена сообщениями и VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Может ли Empathy использовать сотовую сеть для определения местоположения."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy может использовать GPS для определения местоположения"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Может ли Empathy использовать GPS для определения местоположения."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy должен снижать точность местоположения"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Должен ли Empathy уменьшать точность определения местоположения по причинам приватности."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -475,7 +499,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Собеседник не может передавать файлы"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
@@ -496,7 +520,7 @@ msgid "The selected file is empty"
 msgstr "Выбранный файл пуст"
 
 #: ../libempathy/empathy-message.c:415
-#: ../src/empathy-call-observer.c:131
+#: ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропущенный вызов от %s"
@@ -512,170 +536,174 @@ msgstr "Разговор с %s"
 msgid "Call from %s"
 msgstr "Вызов от %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "В сети"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Не беспокоить"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Отсутствует"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Невидимость"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Не в сети"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Причина не указана"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Установлен статус «не в сети»"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Ошибка сети"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Аутентификация не удалась"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Ошибка шифрования"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Имя уже занято"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертификат недоступен"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификат не является доверенным"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификат устарел"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификат не активирован"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Имена узлов сертификатов не совпадают"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Отпечатки сертификатов не совпадают"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификат подписан самостоятельно"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Ошибка сертификата"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифрование недоступно"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Неверный сертификат"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Запрос на подключение отклонён"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Не удалось установить соединение"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Соединение разорвано"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Этот ресурс уже подключён к серверу"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Эта учётная запись уже подключена к серверу"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Подключение было замещено новым подключение с этим же ресурсом"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Учётная запись уже существует на сервере"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "В настоящий момент сервер слишком загружен, чтобы обработать подключение."
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификат аннулирован"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Сертификат использует небезопасный алгоритм шифра или криптографически слаб"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Длина сертификата сервера или глубина цепочки сертификатов сервера превышает предел, установленный криптографической библиотекой"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Слишком старая версия приложения"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Внутренняя ошибка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Люди поблизости"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Япония"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Беседа Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -683,7 +711,7 @@ msgstr[0] "%d секунду назад"
 msgstr[1] "%d секунды назад"
 msgstr[2] "%d секунд назад"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -691,7 +719,7 @@ msgstr[0] "%d минуту назад"
 msgstr[1] "%d минуты назад"
 msgstr[2] "%d минут назад"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -699,7 +727,7 @@ msgstr[0] "%d час назад"
 msgstr[1] "%d часа назад"
 msgstr[2] "%d часов назад"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -707,7 +735,7 @@ msgstr[0] "%d день назад"
 msgstr[1] "%d дня назад"
 msgstr[2] "%d дней назад"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -715,7 +743,7 @@ msgstr[0] "%d неделю назад"
 msgstr[1] "%d недели назад"
 msgstr[2] "%d недель назад"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -723,16 +751,16 @@ msgstr[0] "%d месяц назад"
 msgstr[1] "%d месяца назад"
 msgstr[2] "%d месяцев назад"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в будущем"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Все учётные записи"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Учётная запись"
 
@@ -750,30 +778,30 @@ msgstr "Сервер"
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "П_рименить"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Войти"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Эта учётная запись уже существует на сервере"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Создать новую учётную запись на сервере"
 
@@ -782,137 +810,137 @@ msgstr "Создать новую учётную запись на сервер�
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Учётная запись %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Новая учётная запись"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> MyScreenName"
+#: ../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:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Дополнительно"
+msgid "Screen _Name:"
+msgstr "_Имя:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запомнить пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "П_орт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запомнить пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Имя:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Какой у вас пароль AIM?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Дополнительно"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Какое у вас имя пользователя AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "П_орт:"
+msgid "What is your AIM password?"
+msgstr "Какой у вас пароль AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> имя_пользователя"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запомнить пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_Идентификатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> имя_пользователя"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Какой у вас ID пользователя GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Какой у вас пароль GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Кодировка:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Какой у вас ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Какой у вас пароль ICQ?"
 
@@ -949,21 +977,25 @@ msgstr "Options"
 msgid "None"
 msgstr "Отсутствует"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Сеть"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Кодировка:"
+msgid "Network:"
+msgstr "Сеть:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Большинство серверов IRC не требует пароля, если вы не уверены, то не вводите пароль."
+msgid "Character set:"
+msgstr "Кодировка:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Сеть"
+msgid "Servers"
+msgstr "Серверы"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Сеть:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Большинство серверов IRC не требует пароля, если вы не уверены, то не вводите пароль."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -981,48 +1013,20 @@ msgstr "Сообщение при выходе:"
 msgid "Real name:"
 msgstr "Настоящее имя:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Серверы"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Какой у вас псевдоним в IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Какая сеть IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> пользователь@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> пользователь@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Требуется шифров_ание (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Игнорировать ошибки сертификатов SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Замещать настройки сервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "При_оритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Какой у вас псевдоним в IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ре_сурс:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Какое у вас имя пользователя Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1032,64 +1036,92 @@ msgstr ""
 "Если ваш адрес facebook.com/<b>badger</b>, введите <b>badger</b>.\n"
 "Используйте <a href=\"http://www.facebook.com/username/\">эту страницу</a> для выбора имени пользователя Facebook, если у вас его ещё нет."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Использовать старое _шифрование (SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Какой у вас пароль Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Какое у вас имя пользователя Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Какой у вас Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> пользователь@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Какой у вас пароль Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> пользователь@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Игнорировать ошибки сертификатов SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "При_оритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ре_сурс:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Требуется шифров_ание (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Использовать старое _шифрование (SSL)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Замещать настройки сервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Какой у вас Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Какой у вас пароль Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Какой Jabber ID вы хотите?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Какой у вас пароль Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Какой пароль Jabber вы хотите?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Какой у вас Windows Live ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Какой у вас пароль Windows Live?"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "_Псевдоним:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "А_дрес эл. почты:"
+msgid "_Last Name:"
+msgstr "_Фамилия:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "Nic_kname:"
-msgstr "_Псевдоним:"
+msgid "_First Name:"
+msgstr "_Имя:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_First Name:"
+msgid "_Published Name:"
 msgstr "_Имя:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
@@ -1097,114 +1129,110 @@ msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Фамилия:"
+msgid "E-_mail address:"
+msgstr "А_дрес эл. почты:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
 msgstr "_Имя:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Имя пользователя для аутентификации:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Обнаруживать соединения"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Автоматический поиск сервера STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Использовать эту учётную запись для звонков на _обычные и мобильные телефоны"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Игнорировать ошибки TLS"
+msgid "NAT Traversal Options"
+msgstr "Параметры NAT Traversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Интервал (в секундах)"
+msgid "Proxy Options"
+msgstr "Параметры прокси"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Параметры Keep-Alive"
+msgid "Miscellaneous Options"
+msgstr "Различные параметры"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Свободная маршрутизация"
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизм:"
+msgid "Discover the STUN server automatically"
+msgstr "Автоматический поиск сервера STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Различные параметры"
+msgid "Discover Binding"
+msgstr "Обнаруживать соединения"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Параметры NAT Traversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Параметры Keep-Alive"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Параметры прокси"
+msgid "Interval (seconds)"
+msgstr "Интервал (в секундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Имя пользователя для аутентификации:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Транспорт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Loose Routing"
+msgstr "Свободная маршрутизация"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Игнорировать ошибки TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Транспорт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Использовать эту учётную запись для звонков на _обычные и мобильные телефоны"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Какой у вас пароль учётной записи SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Какой у вас ID входа для SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Имя:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Какой у вас пароль учётной записи SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Игнорировать приглашения к беседам и конференциям"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локаль списка бесед:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Какой у вас  Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Какой у вас пароль Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локаль списка бесед:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1242,213 +1270,219 @@ msgstr "Все файлы"
 msgid "Click to enlarge"
 msgstr "Щёлкните для увеличения"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Во время вызова произошла ошибка"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Указанный контакт не поддерживает звонки"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Указанный собеседник не находится в сети"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Указанный собеседник не является допустимым"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Срочные телефонные звонки не поддерживаются этим протоколом"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Недостаточно средств, чтобы сделать этот звонок"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Не удалось открыть личную беседу"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "В этой беседе темы не поддерживаются"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Вы не можете менять тему"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» не является допустимым идентификатором контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очистить все сообщения в текущей беседе"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: установить тему текущей беседы"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID комнаты>: войти в новую комнату"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID комнаты>] [<причина>]: покинуть комнату, по умолчанию — текущую"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID контакта> [<сообщение>]: открыть личную беседу"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID контакта> <сообщение>: открыть личную беседу"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <псевдоним>: изменить псевдоним на текущем сервере"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <сообщение>: отправить сообщение о ДЕЙСТВИИ"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <сообщение>: отправить <сообщение> в текущей беседе. Используется для отправки сообщения, начинающегося с «/». Например: «/say /join используется для входа в новую комнату»"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID контакта>: показать информацию о контакте"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<команда>]: показать все поддерживаемые команды. Если <команда> определена, показать её использование."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Использование: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Неизвестная команда; для всех доступных команд см. /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "недостаточно средств для отправки сообщения"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Ошибка при отправке сообщения «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Ошибка при отправке сообщения: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "недостаточно средств для отправки сообщения. <a href='%s'>Пополнить</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "не поддерживается"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "не в сети"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "неверный собеседник"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "отказано"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "слишком длинное сообщение"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "эта возможность не санкционирована"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "неизвестно"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Пользователь %s установил тему: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Тема не установлена"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Нет предположений)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Добавить «%s» в словарь"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Добавить «%s» в словарь «%s»"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Вставить улыбку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "От_править"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_Варианты правописания"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Не удалось получить последние журналы"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s отключился"
@@ -1456,12 +1490,12 @@ msgstr "%s отключился"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s выгнал %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s выгнали"
@@ -1469,17 +1503,17 @@ msgstr "%s выгнали"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s забанил %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s забанили"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинул беседу"
@@ -1489,17 +1523,17 @@ msgstr "%s покинул беседу"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s присоединился к беседе"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
@@ -1507,58 +1541,58 @@ msgstr "%s теперь известен как %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279
+#: ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "Отсоединён"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Хотите запомнить этот пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Запомнить"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Не сейчас"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Повторить"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Неправильный пароль. Попробуйте снова:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Эта комната защищена паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Войти"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
-#: ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070
+#: ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Соединён"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Беседа"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1590,10 +1624,10 @@ msgstr "Изменить заблокированных собеседников
 #. 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:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Учётная запись:"
 
@@ -1603,7 +1637,7 @@ msgstr "Заблокированные собеседники"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Удалить"
@@ -1626,33 +1660,29 @@ msgstr "_Открыть ссылку"
 msgid "%A %B %d %Y"
 msgstr "%A %d %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Личная информация"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Новый собеседник"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Заблокировать %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 "Уверены, что хотите заблокировать «%s»?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Заблокировать"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1661,17 +1691,17 @@ msgstr[1] "_Пожаловаться на этих собеседников"
 msgstr[2] "_Пожаловаться на этих собеседников"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Решить _позже"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запрос на подписку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Заблокировать пользователя"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Решить _позже"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1826,7 +1856,7 @@ msgstr "Высота:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Местоположение"
 
@@ -1843,15 +1873,25 @@ msgid "%B %e, %Y at %R UTC"
 msgstr "%e %b %Y в %R UTC"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Сохранить аватар"
 
 #: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Неудалось сохранить аватар"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Информация о пользователе"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Информация о собеседнике"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Полное имя:"
@@ -1917,68 +1957,63 @@ msgstr "почтовый"
 msgid "parcel"
 msgstr "посылка"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Местоположение</b> от (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Идентификатор:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Псевдоним:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Информация о клиенте"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Программа-клиент:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Местоположение</b> от (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Информация о собеседнике"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Информация запрошена..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Идентификатор:"
+msgid "Client Information"
+msgstr "Информация о клиенте"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Информация запрошена..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "Операционная система:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Версия:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Программа-клиент:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Группы"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid "Select the groups you want this contact to appear in.  Note that you can select more than one group or no groups."
 msgstr "Выберите группы, в которых должен появиться собеседник. Можно выбрать больше одной группы или не выбирать вообще."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Добавить группу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Выбрать"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1949
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Группа"
 
@@ -2000,165 +2035,149 @@ msgstr[2] "Следующих собеседников нельзя заблок
 msgid "Edit Contact Information"
 msgstr "Редактировать информацию о собеседнике"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Объединённые контакты"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Выбрать контакты для связи"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Предпросмотр нового собеседника"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Контакты, выбранные в списке слева, будут объединены."
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Выберите учётную запись для вызова"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Вызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Рабочий"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "ДОМАШНИЙ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Заблокировать собеседника"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-main-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Разговор"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS:"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Аудиовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-main-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Предыдущие _беседы"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Предоставить доступ к моему рабочему столу"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Избранный"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не установлен"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Чтобы получить доступ к сведениям о пользователях, установите gnome-contacts"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Информ_ация"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Правка"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Объединить контакты…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Приглашение в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Пригласить в комнату"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-main-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Добавить собеседника…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Удалить и _заблокировать"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вы хотите удалить группу «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Удаление группы"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Действительно хотите удалить собеседника «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, 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 "Действительно удалить связанный контакт «%s»? Это приведёт к удалению всех контактов, которые являются частью этого связанного контакта."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Удаление собеседника"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2170,23 +2189,23 @@ msgstr[2] "Связанные контакты, содержащие %u конт
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Местоположение</b> от (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "В сети с помощью телефона или мобильного устройства"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Новая сеть"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Выберите сеть IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_Сбросить список сетей"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Выбрать"
@@ -2199,86 +2218,48 @@ msgstr "новый сервер"
 msgid "SSL"
 msgstr "Шифрование SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Связь с собеседниками"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Разъединить…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Полностью разъединить связанные контакты на отдельные контакты."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Связь"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Разъединить контакты «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Действительно разъединить эти связанные контакты? Это полностью разделит связанные контакты на отдельные контакты."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Разъединить"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "История"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Показать"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Поиск"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Разговор в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Разговор с %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2286,7 +2267,7 @@ msgstr[0] "%s секунда"
 msgstr[1] "%s секунды"
 msgstr[2] "%s секунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2294,121 +2275,121 @@ msgstr[0] "%s минута"
 msgstr[1] "%s минуты"
 msgstr[2] "%s минут"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Вызов продолжался %s, закончился %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Сегодня"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Всегда"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Любой"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Кто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Когда"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Всё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Текстовые чаты"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Входящие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Исходящие вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропущенные вызовы"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Что"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Действительно хотите удалить все журналы предыдущих бесед?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Очистить всё"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Удалить из:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Загрузка…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Разговор"
+#: ../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 "_Правка"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Удалить всю историю…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профиль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Разговор"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Правка"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "страница 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Загрузка…</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Указанный собеседник не находится в сети"
@@ -2454,7 +2435,7 @@ msgid "There was an error starting the conversation"
 msgstr "Во время вызова произошла ошибка"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Введите идентификатор собеседника или номер телефона:"
 
@@ -2464,17 +2445,17 @@ msgid "New Conversation"
 msgstr "Новая беседа"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Видеовызов"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Аудиовызов"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Новый вызов"
 
@@ -2530,7 +2511,7 @@ msgstr "Другие сообщения…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Новая учетная запись %s"
@@ -2540,20 +2521,20 @@ msgid "Find:"
 msgstr "Найти:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "У_читывать регистр"
+msgid "_Previous"
+msgstr "_Назад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фраза не найдена"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Далее"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "У_читывать регистр"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Назад"
+msgid "Phrase not found"
+msgstr "Фраза не найдена"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2599,12 +2580,12 @@ msgstr "Вызов завершён"
 msgid "Edit Custom Messages"
 msgstr "Изменить настраиваемые сообщения"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Сообщение изменено %s "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Обычная"
 
@@ -2679,39 +2660,43 @@ msgid "Certificate hostname: %s"
 msgstr "Имя узла сертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продолжить"
+msgid "C_ontinue"
+msgstr "_Продолжить"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Недоверенное соединение"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Данное соединение не является доверенным. Всё равно продолжить?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запомнить выбор для последующих соединений"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Подробности о сертификате"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Невозможно открыть URL"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Выберите файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Недостаточно свободного места для сохранения файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "Для сохранения этого файла требуется %s свободного места, но доступно только %s. Выберите другое местоположение."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Входящий файл от %s"
@@ -2891,23 +2876,23 @@ msgstr "Сообщение об ошибке отсутствует"
 msgid "Instant Message (Empathy)"
 msgstr "Мгновенное сообщение (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Не соединяться при запуске"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Не показывать список собеседников и диалоговые окна при запуске"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " — клиент обмена мгновенными сообщениями Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Ошибка связи с диспетчером учётных записей"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2942,204 +2927,77 @@ msgstr ""
 "Mikhail Zabaluev\n"
 "Валёк Филиппов"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "При импортировании учётных записей произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Во время разбора информации об учётной записи произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Во время создания учётной записи произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Произошла ошибка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Сообщение об ошибке: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Вы можете вернуться назад и попытаться ввести информацию об учётной записи ещё раз, или закрыть этот мастер и добавить учётные записи позже из меню «Правка»."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Произошла ошибка"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Какой у вас тип учётной записи?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "У вас есть ещё какие-нибудь учётные записи для настройки?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Введите информацию о вашей учётной записи"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Какой тип учётной записи вы хотите создать?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Хотите создать другие учётные записи?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Введите информацию о новой учётной записи"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "С помощью Empathy можно общаться с людьми, находящимися поблизости, а также с друзьями и коллегами, использующими Google Talk, AIM, Windows Live и многие другие программы. При наличии микрофона и веб-камеры можно совершать аудио- и видеовызовы."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "У вас есть учётная запись, которую вы использовали в другой программе?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Да, импортировать информацию о моей учётной записи"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, я сейчас введу информацию об учётной записи"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Нет, я хочу новую учётную запись"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Нет, я только хочу найти поблизости людей в сети"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Выберите учётные записи для импортирования:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Нет, на данный момент это всё"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy может автоматически найти людей, подключённых к той же сети, что и вы. Если вы хотите использовать эту возможность, отметьте, что информация, представленная ниже является корректной. Вы можете изменить эту информацию позже или отключить эту возможность, используя диалоговое окно «Учётные записи»."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Правка->Учётные записи"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "_Я не хочу сейчас включать эту возможность"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Вы не можете общаться с людьми, подключёнными к вашей локальной сети, т. к. telepathy-salut не установлен. Если вы хотите включить эту возможность, установите пакет telepathy-salut и создайте учётную запись «Люди поблизости» в диалоговом окне «Учётные записи»"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut не установлен"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Мастер учётных записей обмена сообщениями и VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Добро пожаловать в Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Импортировать существующие учётные записи"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Введите персональную информацию"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "В учётной записи %s имеются несохранённые изменения."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Ваша новая учётная запись ещё не была сохранена."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Соединение…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Не в сети — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Отсоединён — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Не в сети — подключение к сети отсутствует"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "Эта учётная запись отключена, т. к. она использует неподдерживаемый драйвер. Установите  telepathy-haze и перезапустите сеанс, чтобы перенести учётную запись."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Не в сети — учётная запись отключена"
 
-#: ../src/empathy-accounts-dialog.c:538
-#| msgid "Connection has been refused"
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Изменить параметры соединения"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Сбой при получении персональных данных с сервера."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Выйти в онлайн, чтобы изменить персональные данные"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Изменить параметры соединения…"
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Хотите удалить %s со своего компьютера?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Это не приведёт к удалению вашей учётной записи с сервера."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3148,15 +3006,23 @@ msgstr ""
 "к отмене сделанных изменений. Хотите продолжить?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Включить"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Отключить"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Пропустить"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Подключиться"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3168,45 +3034,37 @@ msgstr ""
 msgid "Add…"
 msgstr "Добавить…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Загрузка информации об учётной записи"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Нет установленных протоколов"
+msgid "_Import…"
+msgstr "_Импорт..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Загрузка информации об учётной записи"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "Чтобы добавить новую учётную запись установите поддержку каждого необходимого протокола."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Импорт..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Нет установленных драйверов протоколов"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — клиент аутентификации Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Клиент аутентификации Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Люди поблизости"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " — клиент Empathy для аудио и видео"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Клиент Empathy для аудио и видео"
 
@@ -3249,255 +3107,289 @@ msgstr "Подробности"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Разговор с %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP-адрес, определённый хостом"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-адрес, определённый сервером в Интернете"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-адрес точки, определённый с другой стороны"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP-адрес ретранслирующего сервера"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Широковещательный IP-адрес группы"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Неизвестно"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Соединён — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Информация о собеседнике"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Программное обеспечение %s не понимает аудиоформаты, поддерживаемые вашим компьютером"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Программное обеспечение %s не понимает видеоформаты, поддерживаемые вашим компьютером"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Не удалось установить соединение с %s. Один из вас может находиться в сети, которая не поддерживает прямые подключения."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Сбой сети"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Аудиоформаты, необходимые для этого вызова, не установлены на вашем компьютере"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Видеоформаты, необходимые для этого вызова, не установлены на вашем компьютере"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Что-то неожиданное случилось с компонентом Telepathy. <a href=\"%s\">Сообщите об этой ошибке</a> и прикрепите журналы, собранные из окна отладки в меню «Справка»."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Сбой в движке вызова"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Достигнут конец потока"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Не удалось установить аудиопоток"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Не удалось установить видеопоток"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Аудио"
+msgid "_Call"
+msgstr "_Вызов"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Декодер:"
+msgid "_Microphone"
+msgstr "_Микрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Отключить камеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Показывать панель набора"
+msgid "_Settings"
+msgstr "_Параметры"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодер:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Вид"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Сбросить"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Справка"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Завершить текущий вызов"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Содержание"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локальный кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "О_тладка"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Максимальный размер"
+msgid "Swap camera"
+msgstr "Сменить камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Минимальный размер"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Удалённый кандидат:"
+msgid "Maximise me"
+msgstr "Максимальный размер"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Передавать звук"
+msgid "Disable camera"
+msgstr "Отключить камеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Передавать видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Сбросить"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Показывать панель набора"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Завершить текущий вызов"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видеовызов"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Начать видеовызов"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Начать аудиовызов"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Сменить камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Включить или выключить передачу звука"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Включить или выключить передачу видео"
+msgid "Show dialpad"
+msgstr "Показывать панель набора"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Неизвестно"
+msgid "Display the dialpad"
+msgstr "Показывать панель набора"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Передавать видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видеовызов"
+msgid "Toggle video transmission"
+msgstr "Включить или выключить передачу видео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Вызов"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Передавать звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Содержание"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Включить или выключить передачу звука"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "О_тладка"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодер:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Неизвестно"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Справка"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Декодер:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Микрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Удалённый кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Параметры"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локальный кандидат:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Вид"
+msgid "Audio"
+msgstr "Аудио"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрыть это окно?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "Если вы закроете окно, то выйдете из комнаты %s. Вы не будете получать сообщения, пока не войдёте в комнату. "
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "Если вы закроете окно, то выйдете из %u комнаты. Вы не будете получать сообщения, пока не войдёте в комнату. "
+msgstr[1] "Если вы закроете окно, то выйдете из %u комнат. Вы не будете получать сообщения, пока не войдёте в комнаты."
+msgstr[2] "Если вы закроете окно, то выйдете из %u комнат. Вы не будете получать сообщения, пока не войдёте в комнаты."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Уйти из %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Вы не будете получать сообщения из этой комнаты, пока повторно не войдёте в комнату."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрыть окно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Уйти из комнаты"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3505,7 +3397,7 @@ msgstr[0] "%s (%d непрочитанное)"
 msgstr[1] "%s (%d непрочитанных)"
 msgstr[2] "%s (%d непрочитанных)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3513,7 +3405,7 @@ msgstr[0] "%s (и %u другой)"
 msgstr[1] "%s (и %u других)"
 msgstr[2] "%s (и %u других)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3521,7 +3413,7 @@ msgstr[0] "%s (%d непрочитанное от других)"
 msgstr[1] "%s (%d непрочитанных от других)"
 msgstr[2] "%s (%d непрочитанных от других)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3529,11 +3421,11 @@ msgstr[0] "%s (%d непрочитанное ото всех)"
 msgstr[1] "%s (%d непрочитанных ото всех)"
 msgstr[2] "%s (%d непрочитанных ото всех)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3541,70 +3433,70 @@ msgstr[0] "Отправка %d сообщения"
 msgstr[1] "Отправка %d сообщений"
 msgstr[2] "Отправка %d сообщений"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Набирает сообщение."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "О_чистить"
+msgid "_Conversation"
+msgstr "_Беседа"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "Со_беседник"
+msgid "C_lear"
+msgstr "О_чистить"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Вставить _улыбку"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Избранная комната"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Пригласить _участника…"
+msgid "Notify for All Messages"
+msgstr "Уведомлять обо всех сообщениях"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Передвинуть вкладку в_лево"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Показывать список собеседников"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Передвинуть вкладку в_право"
+msgid "Invite _Participant…"
+msgstr "Пригласить _участника…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Уведомлять обо всех сообщениях"
+msgid "C_ontact"
+msgstr "Со_беседник"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Беседа"
+msgid "_Tabs"
+msgstr "В_кладки"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Отсоединить вкладку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Избранная комната"
+msgid "_Previous Tab"
+msgstr "На пред_ыдущую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "На след_ующую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "На пред_ыдущую вкладку"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Восстановить закрытую вкладку"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Показывать список собеседников"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Передвинуть вкладку в_лево"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "В_кладки"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Передвинуть вкладку в_право"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Восстановить закрытую вкладку"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Отсоединить вкладку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3618,106 +3510,106 @@ msgstr "Комната"
 msgid "Auto-Connect"
 msgstr "Автоматическое соединение"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Управление избранными комнатами"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Входящий видеовызов"
 
-#: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Входящий вызов"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s делает видеовызов. Хотите ответить?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s вызывает вас. Хотите ответить?"
 
-#: ../src/empathy-event-manager.c:531
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Входящий вызов от %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Отказать"
 
-#: ../src/empathy-event-manager.c:564
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Ответить"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Ответить с _видео"
 
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Входящий видеовызов от %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Приглашение к беседе"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Предложение присоединиться к %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s предлагает присоединиться к %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Отклонить"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Войти"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s предложил присоединиться к %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Вам предложили присоединиться к %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Входящий файл от %s"
 
-#: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Требуется пароль"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "Пользователь %s хотел бы видеть, когда вы находитесь в сети"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3840,174 +3732,192 @@ msgstr "Передачи файлов"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Удалить из списка завершённые, отменённые или прерванные передачи файлов"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Импортировать"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "Не найдено учётных записей для импортирования. На данный момент возможно импортировать учётные записи только из Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Импортировать учётные записи"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Импорт"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Источник"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Указать пароль"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Разъединить"
 
-#: ../src/empathy-main-window.c:635
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Чтобы увидеть собеседников, необходимо настроить учётную запись."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Нет совпадений"
 
-#: ../src/empathy-main-window.c:743
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Учётные записи %s нельзя использовать до тех пор, пока не будет обновлено приложение %s."
 
-#: ../src/empathy-main-window.c:811
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Обновить приложение…"
 
-#: ../src/empathy-main-window.c:817
-#: ../src/empathy-main-window.c:938
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрыть"
 
-#: ../src/empathy-main-window.c:926
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Переподключиться"
 
-#: ../src/empathy-main-window.c:932
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Правка учётной записи"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1071
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Пополнить %s (%s)…"
 
-#: ../src/empathy-main-window.c:1118
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Пополнить кредит счёта"
 
 #. top up button
-#: ../src/empathy-main-window.c:1189
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Пополнить…"
 
-#: ../src/empathy-main-window.c:1931
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Собеседник"
 
-#: ../src/empathy-main-window.c:2306
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Чтобы увидеть собеседников, необходимо включить одну из ваших учётных записей."
+
+#. 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 "Чтобы увидеть собеседников, необходимо включить учётную запись %s."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Список собеседников"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Собеседники на _карте"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Настроить учётную запись"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Остаток кредита"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "Новая _беседа…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Найти в списке _собеседников"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Новый _вызов…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "П_одключить избранные"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Поиск собеседников…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Настроить избранные"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Передачи _файлов"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Обычный _размер"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Собеседники _не в сети"
 
-#: ../src/empathy-main-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Новый _вызов…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Показывать п_ротоколы"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Обычный размер с _аватарами"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Остаток кредита"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Собеседники на _карте"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Учётные записи"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Заблокированные собеседники"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Параметры"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Показывать п_ротоколы"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Найти в списке _собеседников"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Упорядочить по _имени"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Упорядочить по с_татусу"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Учётные записи"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Обычный размер с _аватарами"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Заблокированные собеседники"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Обычный _размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Компактный размер"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Передачи _файлов"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Комната"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Войти…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "Новая _беседа…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Собеседники _не в сети"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Личная информация"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Комната"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "П_одключить избранные"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Поиск собеседников…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Настроить избранные"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4019,7 +3929,7 @@ msgstr "Участники"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4032,43 +3942,48 @@ msgstr ""
 "Требуется пароль: %s\n"
 "Участники: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Нет"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Не удалось начать формирование списка комнат"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Не удалось остановить формирование списка комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Не удалось загрузить список комнат"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Войти в комнату"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Введите имя беседы, к которой хотите присоединиться, или выберите одну (или более) в списке."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Комната:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Введите сервер беседы, или оставьте пустым, если беседа находится на сервере текущей учётной записи"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Войти в комнату"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Не удалось загрузить список комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Список комнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Комната:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Сообщение получено"
@@ -4082,7 +3997,7 @@ msgid "New conversation"
 msgstr "Новая беседа"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Собеседник вошёл в сеть"
 
 #: ../src/empathy-preferences.c:170
@@ -4102,308 +4017,337 @@ msgid "Language"
 msgstr "Язык"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Джульета"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео, о зачем же ты Ромео!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Покинь отца и отрекись навеки"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "От имени родного, а не хочешь —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Так поклянись, что любишь ты меня, —"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "И больше я не буду Капулетти."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Джульета отключилась"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Параметры"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Показывать _графические улыбки"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Показывать _список собеседников в комнатах"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Внешний вид"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведение"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Начинать беседы в:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема оформления беседы:"
+msgid "new ta_bs"
+msgstr "новых _вкладках"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "В_ыключить уведомления в состоянии «отсутствует» или «не беспокоить»"
+msgid "new _windows"
+msgstr "новых о_кнах"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "В_ыключить звуки в состоянии «отсутствует» или «не беспокоить»"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показывать приближающиеся события в области уведомлений"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Автоматически соединяться при запуске"
+
 #: ../src/empathy-preferences.ui.h:9
-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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Подавление эха позволяет сделать передачу вашего голоса чище, но это может вызывать проблемы на некоторых компьютерах. Если вы или ваш собеседник слышите странные шумы или сбои во время разговора, попробуйте выключить подавление эха и повторить вызов собеседника."
+msgid "Log conversations"
+msgstr "Вести журнал бесед"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Включить уведомления, когда собеседник появляется в сети"
+msgid "Behavior"
+msgstr "Поведение"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Включить уведомления, когда собеседник выходит из сети"
+msgid "General"
+msgstr "Общие"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Включить уведомления, когда _беседа не в фокусе"
+msgid "_Enable bubble notifications"
+msgstr "Включить _всплывающие уведомления"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Включить проверку орфографии для языков:"
+msgid "Disable notifications when _away or busy"
+msgstr "В_ыключить уведомления в состоянии «отсутствует» или «не беспокоить»"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Общие"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Включить уведомления, когда _беседа не в фокусе"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Включить уведомления, когда собеседник появляется в сети"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Источники местоположений:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Включить уведомления, когда собеседник выходит из сети"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Вести журнал бесед"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Уведомления"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Включить звуковые уведомления"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Воспроизводить звук для событий"
+msgid "Disable sounds when _away or busy"
+msgstr "В_ыключить звуки в состоянии «отсутствует» или «не беспокоить»"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Приватность"
+msgid "Play sound for events"
+msgstr "Воспроизводить звук для событий"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Примерное определение местоположения означает, что публикуется только ваш город, регион и страна. Координаты GPS будут отображаться с точностью до 1 знака после запятой."
+msgid "Sounds"
+msgstr "Звуки"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Показывать _графические улыбки"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Использовать подавление _эха для улучшения качества связи"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Показывать _список собеседников в комнатах"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Звуки"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Проверка орфографии"
+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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Подавление эха позволяет сделать передачу вашего голоса чище, но это может вызывать проблемы на некоторых компьютерах. Если вы или ваш собеседник слышите странные шумы или сбои во время разговора, попробуйте выключить подавление эха и повторить вызов собеседника."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "В этом списке показаны только те языки, для которых установлены словари."
+msgid "_Publish location to my contacts"
+msgstr "Пу_бликовать местоположение для собеседников"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Темы"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Использовать подавление _эха для улучшения качества связи"
+msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
+msgstr "Примерное определение местоположения означает, что публикуется только ваш город, регион и страна. Координаты GPS будут отображаться с точностью до 1 знака после запятой."
 
+#. 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 "Variant:"
-msgstr "Вариант:"
+msgid "_Reduce location accuracy"
+msgstr "_Снижать точность определения местоположения"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_Автоматически соединяться при запуске"
+msgid "Privacy"
+msgstr "Приватность"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "С_отовая сеть"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "Включить _всплывающие уведомления"
+msgid "_Cellphone"
+msgstr "С_отовая сеть"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Включить звуковые уведомления"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "С_еть (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Источники местоположений:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Открывать новые беседы в отдельном окне"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "В этом списке показаны только те языки, для которых установлены словари."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "Пу_бликовать местоположение для собеседников"
+msgid "Enable spell checking for languages:"
+msgstr "Включить проверку орфографии для языков:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Проверка орфографии"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "_Снижать точность определения местоположения"
+msgid "Chat Th_eme:"
+msgstr "_Тема оформления беседы:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Вариант:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Темы"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Состояние"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "В_ыход"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Перезвонить собеседнику"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Камера выключена"
+msgid "Redial"
+msgstr "Перезвонить"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Камера включена"
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Видео выключено"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Выключить камеру и остановить отправку видео"
+msgid "Video Preview"
+msgstr "Предварительный просмотр видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Включить камеру и отправить видео"
+msgid "Video On"
+msgstr "Видео включено"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Включить камеру, но не отправлять видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Перезвонить собеседнику"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Предварительный просмотр"
+msgid "Camera Off"
+msgstr "Камера выключена"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Перезвонить"
+msgid "Disable camera and stop sending video"
+msgstr "Выключить камеру и остановить отправку видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Предварительный просмотр"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Видео выключено"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Включить камеру, но не отправлять видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Видео включено"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Камера включена"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Предварительный просмотр видео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Включить камеру и отправить видео"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Собеседники на карте"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Сохранить"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Ссылка pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Ответ pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Слишком много данных для вставки. Сохраните журналы в файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Окно отладки"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Отправить в pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Уровень"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Отладка"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Информация"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критическая ошибка"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Время"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категория"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Уровень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Выбранный менеджер соединений не поддерживает расширение удалённой отладки."
 
@@ -4420,31 +4364,27 @@ msgstr "Выберите собеседника для приглашения к
 msgid "Invite"
 msgstr "Пригласить"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Не показывать диалоговые окна; выполнить работу (напр., импортирование) и выйти"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Не показывать диалоговые окна до тех пор, пока используются только уч. записи «Люди поблизости»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Сначала выберите учётную запись (например, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Показывать баланс в списке собеседников"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Учётные записи Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Учётные записи Empathy"
 
@@ -4460,86 +4400,86 @@ msgstr "— Отладчик Empathy"
 msgid "Empathy Debugger"
 msgstr "Отладчик Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr " — клиент обмена мгновенными сообщениями Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Ответить"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Отказать"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Ответить"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Ответить с видео"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Отклонить"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Принять"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Предоставить"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "Собеседник %s попытался до вас дозвониться, но вы принимали другой вызов."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "Инфо"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Удержание"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Приглушить"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Длительность"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Текущий баланс: %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Недостаточно средств для совершения звонка."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Пополнить"
 
@@ -4547,11 +4487,191 @@ msgstr "Пополнить"
 msgid "_Match case"
 msgstr "_Учитывать регистр"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Какой у вас тип учётной записи?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
-#| msgid "New account"
 msgid "Adding new account"
 msgstr "Добавление учётной записи"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Люди поблизости"
+
+#: ../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."
+msgstr "Empathy может автоматически найти людей, подключённых к той же сети, что и вы. Если вы хотите использовать эту возможность, отметьте, что информация, представленная ниже является корректной."
+
+#: ../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 "Вы можете отключить эту возможность или изменить информацию о себе, выбрав в списке собеседников <span style=\"italic\">Правка → Учётные записи</span>."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "При импортировании учётных записей произошла ошибка."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Во время разбора информации об учётной записи произошла ошибка."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Во время создания учётной записи произошла ошибка."
+
+#~ msgid "There was an error."
+#~ msgstr "Произошла ошибка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Сообщение об ошибке: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Вы можете вернуться назад и попытаться ввести информацию об учётной "
+#~ "записи ещё раз, или закрыть этот мастер и добавить учётные записи позже "
+#~ "из меню «Правка»."
+
+#~ msgid "An error occurred"
+#~ msgstr "Произошла ошибка"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "У вас есть ещё какие-нибудь учётные записи для настройки?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Введите информацию о вашей учётной записи"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Какой тип учётной записи вы хотите создать?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Хотите создать другие учётные записи?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Введите информацию о новой учётной записи"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "С помощью Empathy можно общаться с людьми, находящимися поблизости, а "
+#~ "также с друзьями и коллегами, использующими Google Talk, AIM, Windows "
+#~ "Live и многие другие программы. При наличии микрофона и веб-камеры можно "
+#~ "совершать аудио- и видеовызовы."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "У вас есть учётная запись, которую вы использовали в другой программе?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Да, импортировать информацию о моей учётной записи"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Да, я сейчас введу информацию об учётной записи"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Нет, я хочу новую учётную запись"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Нет, я только хочу найти поблизости людей в сети"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Выберите учётные записи для импортирования:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Нет, на данный момент это всё"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Правка->Учётные записи"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_Я не хочу сейчас включать эту возможность"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Вы не можете общаться с людьми, подключёнными к вашей локальной сети, т. "
+#~ "к. telepathy-salut не установлен. Если вы хотите включить эту "
+#~ "возможность, установите пакет telepathy-salut и создайте учётную запись "
+#~ "«Люди поблизости» в диалоговом окне «Учётные записи»"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut не установлен"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Мастер учётных записей обмена сообщениями и VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Добро пожаловать в Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Импортировать существующие учётные записи"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Введите персональную информацию"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Показывать баланс в списке собеседников"
+
+#~ msgid "Personal Information"
+#~ msgstr "Личная информация"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Объединённые контакты"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Выбрать контакты для связи"
+
+#~ msgid "New contact preview"
+#~ msgstr "Предпросмотр нового собеседника"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Контакты, выбранные в списке слева, будут объединены."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Объединить контакты…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Связь с собеседниками"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "_Разъединить…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Полностью разъединить связанные контакты на отдельные контакты."
+
+#~ msgid "_Link"
+#~ msgstr "_Связь"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Разъединить контакты «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Действительно разъединить эти связанные контакты? Это полностью разделит "
+#~ "связанные контакты на отдельные контакты."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_Разъединить"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Личная информация"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Открывать новые беседы в отдельном окне"
+
 #~ msgid "My Web Accounts"
 #~ msgstr "Мои сетевые учётные записи"
 
diff --git a/po/sl.po b/po/sl.po
index 5b56c2e33..ead7c53a0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,492 +10,516 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-01-21 10:39+0000\n"
-"PO-Revision-Date: 2012-01-21 20:36+0100\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-12 12:36+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenščina <gnome-si@googlegroups.com>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
+"Language: \n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
 "X-Poedit-Language: Slovenian\n"
 "X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah."
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Hipni sporočilnik"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy hipno sporočanje"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Hipni sporočilnik"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Klepet na Google Talk, Facebook, MSN in na mnogih drugih klepetalnih storitvah."
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Sporočanje in računi VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljanje s sporočanjem in računi VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Za nov klepet vedno odpri ločeno klepetalno okno."
+msgid "Connection managers should be used"
+msgstr "Uporabljen naj bo upravljalnik omrežja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Naprava kamere"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Položaj kamere"
+msgid "Empathy should auto-connect on startup"
+msgstr "Program Empathy naj se samodejno poveže ob zagonu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše račune."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Tema klepetalnega okna"
+msgid "Empathy should auto-away when idle"
+msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Različica teme klepetalnega okna"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Z vejico ločen seznam uporabljenih črkovalnikov (primer: \"sl, en, fr\")."
+msgid "Empathy default download folder"
+msgstr "Privzeta mapa za prenos datotek"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Skrči seznam stikov"
+msgid "The default folder to save file transfers in."
+msgstr "Privzeta mapa za shranjevanje prejetih datotek."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Uporabljen naj bo upravljalnik omrežja"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "Magično število, uporabljeno za preverjanje ali naj se naloge čiščenja izvedejo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Kriterij razvrščanja seznama stikov"
+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."
+msgstr "Število empathy-sanity-cleaning.c preverja ali naj se naloge čiščenja izvedejo ali ne. Tega ključa ni priporočljivo spreminjati ročno."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Pot predmeta vodila D-Bus zadnjega izbranega računa pri pridruženju klepetalnici."
+msgid "Show offline contacts"
+msgstr "Pokaži tudi nepovezane stike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Privzeta mapa slik za izbor podobe"
+msgid "Show avatars"
+msgstr "Pokaži podobe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Onemogoči pojavna obvestila ob odsotnosti"
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Onemogoči zvok ob odsotnosti"
+msgid "Show protocols"
+msgstr "Pokaži protokole"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Prikaz prihajajočih dogodkov v vrstici stanja."
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Prikaz prihajajočih dogodkov v vrstici stanja. V primeru, da možnost ni izbrana, bodo prikazane takoj."
+msgid "Show Balance in contact list"
+msgstr "Pokaži stanje na računu v seznamu stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Podpora odpravljanju odmevov"
+msgid "Whether to show account balances in the contact list."
+msgstr "Ali naj se v seznamu stikov pokaže tudi stanje na računu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
+msgid "Compact contact list"
+msgstr "Skrči seznam stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Program Empathy lahko uporabi GPS za ugotavljanje mesta nahajanja"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Ali naj bo v skrčenem pogledu prikazan seznam stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
+msgid "Hide main window"
+msgstr "Skrij glavno okno"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Program Empathy lahko uporabi omrežje za ugotavljanje mesta nahajanja"
+msgid "Hide the main window."
+msgstr "Skrivanje glavnega okna."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Privzeta mapa za prenos datotek"
+msgid "Default directory to select an avatar image from"
+msgstr "Privzeta mapa slik za izbor podobe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Ob nedejavnosti samodejno preklopi na stanje odsotnosti"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Zadnja mapa iz katere je bila izbrana podoba."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Program Empathy naj se samodejno poveže ob zagonu"
+msgid "Open new chats in separate windows"
+msgstr "Nov klepet naj se odpre v ločenem oknu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Program Empathy naj zmanjša natančnost določevanja nahajanja"
+msgid "Always open a separate chat window for new chats."
+msgstr "Za nov klepet vedno odpri ločeno klepetalno okno."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
+msgid "Display incoming events in the status area"
+msgstr "Prikaz prihajajočih dogodkov v vrstici stanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Omogoči razvojna orodja WebKit"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Prikaz prihajajočih dogodkov v vrstici stanja. V primeru, da možnost ni izbrana, bodo prikazane takoj."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Omogoči pojavna obvestila ob novih sporočilih"
+msgid "The position for the chat window side pane"
+msgstr "Položaj stranskega pladnja v klepetalnem oknu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Omogoči črkovalnik"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Shranjen položaj (v točkah) stranskega pladnja v klepetalnem oknu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Skrij glavno okno"
+msgid "Show contact groups"
+msgstr "Pokaži skupine stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Skrivanje glavnega okna."
+msgid "Whether to show groups in the contact list."
+msgstr "Ali naj se v seznamu stikov pokažejo skupine stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Zadnji izbran račun v pogovornem oknu pridruženja klepetalnici"
+msgid "Contact list sort criterion"
+msgstr "Kriterij razvrščanja seznama stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Znak na koncu vzdevka"
+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 "Kateri kriterij naj se uporabi za razvrščanje seznama stikov. Privzeto je razvrščanje po stanju stika z vrednostjo \"stanje\". Vrednost \"ime\" pa razvrsti seznam poimensko."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Nov klepet naj se odpre v ločenem oknu"
+msgid "Use notification sounds"
+msgstr "Uporabi zvoke obvestil"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Pot do želene teme Adium "
+msgid "Whether to play a sound to notify of events."
+msgstr "Ali naj se predvaja zvok ob dogodkih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Pot do želene teme Adium, kadar je ta določena za klepet."
+msgid "Disable sounds when away"
+msgstr "Onemogoči zvok ob odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Predvajaj zvok ob prejetju novih sporočil"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Ali naj se predvaja zvok ob odsotnosti in zaposlenosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Predvajaj zvok ob novih pogovorih"
+msgid "Play a sound for incoming messages"
+msgstr "Predvajaj zvok ob prejetju novih sporočil"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Predvajaj zvok ob pošiljanju sporočil"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Ali naj se predvaja zvok ob prejetju novega sporočila."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Predvajaj zvok ob prijavi stika"
+msgid "Play a sound for outgoing messages"
+msgstr "Predvajaj zvok ob pošiljanju sporočil"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Predvajaj zvok ob odjavi stika"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Ali naj se predvaja zvok ob pošiljanju sporočil."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Predvajaj zvok ob prijavi"
+msgid "Play a sound for new conversations"
+msgstr "Predvajaj zvok ob novih pogovorih"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Predvajaj zvok ob odjavi"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Ali naj se predvaja zvok ob novih pogovorih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žarišču."
+msgid "Play a sound when a contact logs in"
+msgstr "Predvajaj zvok ob prijavi stika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Pokaži pojavna obvestila ob prijavi stikov"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Pokaži pojavna obvestila ob odjavi stikov"
+msgid "Play a sound when a contact logs out"
+msgstr "Predvajaj zvok ob odjavi stika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Položaj predogleda kamere med klicem."
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Pokaži stanje na računu v seznamu stikov"
+msgid "Play a sound when we log in"
+msgstr "Predvajaj zvok ob prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Pokaži podobe"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Ali naj se predvaja zvok ob prijavi v omrežje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Pokaži seznam stikov v klepetalnicah"
+msgid "Play a sound when we log out"
+msgstr "Predvajaj zvok ob odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Pokaži namig ob zapiranju glavnega okna"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Ali naj se predvaja zvok ob odjavi iz omrežja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Pokaži tudi nepovezane stike"
+msgid "Enable popup notifications for new messages"
+msgstr "Omogoči pojavna obvestila ob novih sporočilih"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Pokaži protokole"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporočila."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Jeziki za črkovanje"
+msgid "Disable popup notifications when away"
+msgstr "Onemogoči pojavna obvestila ob odsotnosti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Privzeta mapa za shranjevanje prejetih datotek."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Zadnja mapa iz katere je bila izbrana podoba."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Pokaži pojavna obvestila, ko klepetalno okno ni v žarišču."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Položaj stranskega pladnja v klepetalnem oknu"
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporočila tudi, kadar je klepetalno okno že odprto, vendar ni v žarišču."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Shranjen položaj (v točkah) stranskega pladnja v klepetalnem oknu."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Pokaži pojavna obvestila ob prijavi stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema uporabljena za prikaz pogovorov v klepetalnih oknih."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Različica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Pokaži pojavna obvestila ob odjavi stikov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Uporabi slikovne smeške"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Ali naj se pojavi obvestilo, ko stik izklopi povezavo."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Uporabi zvoke obvestil"
+msgid "Use graphical smileys"
+msgstr "Uporabi slikovne smeške"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Uporabi temo za klepetalnice"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Ali naj se pri pogovorih smeški pretvorijo v sličice."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
+msgid "Show contact list in rooms"
+msgstr "Pokaži seznam stikov v klepetalnicah"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Ali naj bo v klepetalnicah prikazan seznam stikov."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
+msgid "Chat window theme"
+msgstr "Tema klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tema uporabljena za prikaz pogovorov v klepetalnih oknih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Ali naj se ob zagonu program Empathy samodejno prijavi v vaše račune."
+msgid "Chat window theme variant"
+msgstr "Različica teme klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Ali naj ob nedejavnosti program Empathy samodejno vzpostavi stanje odsotnosti."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Različica teme, ki je uporabljena za prikaz pogovorov v klepetalnih oknih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natančnost položaja."
+msgid "Path of the Adium theme to use"
+msgstr "Pot do želene teme Adium "
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Pot do želene teme Adium, kadar je ta določena za klepet."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Ali naj bodo vključena razvijalna orodja WebKit kot je na primer Web Inspector."
+msgid "Enable WebKit Developer Tools"
+msgstr "Omogoči razvojna orodja WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Ali naj upravljalnik omrežja samodejno vzpostavi in prekine povezavo."
+msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Ali naj bodo vključena razvijalna orodja WebKit kot je na primer Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Ali naj se preverja črkovanje besed v želenih jezikih."
+msgid "Inform other users when you are typing to them"
+msgstr "Obvesti druge uporabnike, da jim tipkate besedilo"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Ali naj se pri pogovorih smeški pretvorijo v sličice."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr "Ali naj se pošilja tudi stanje klepeta 'vpisovanje' ali pa 'v premoru'. Trenutno ne vpliva na stanje 'odsoten'."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Ali naj se omogoči filter odpravljanja odmevov Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Uporabi temo za klepetalnice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Ali naj se predvaja zvok ob prijavi stika v omrežje."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Ali naj se za klepetalnice uporablja tema."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Ali naj se predvaja zvok ob odjavi stika iz omrežja."
+msgid "Spell checking languages"
+msgstr "Jeziki za črkovanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Ali naj se predvaja zvok ob dogodkih."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Z vejico ločen seznam uporabljenih črkovalnikov (primer: \"sl, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Ali naj se predvaja zvok ob prejetju novega sporočila."
+msgid "Enable spell checker"
+msgstr "Omogoči črkovalnik"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Ali naj se predvaja zvok ob novih pogovorih."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Ali naj se preverja črkovanje besed v želenih jezikih."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Ali naj se predvaja zvok ob pošiljanju sporočil."
+msgid "Nick completed character"
+msgstr "Znak na koncu vzdevka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Ali naj se predvaja zvok ob prijavi v omrežje."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Znak, ki naj bo dodan vzdevku ob uporabi možnosti dopolnjevanja vzdevkov (zavihek) v skupinskem klepetu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Ali naj se predvaja zvok ob odjavi iz omrežja."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Program naj uporabi podobo stika kot ikono klepetalnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Ali naj se predvaja zvok ob odsotnosti in zaposlenosti."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Ali naj program Empathy uporablja podobe stikov za ikone klepetalnih oken."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Ali naj se pojavi obvestilo, ko stik izklopi povezavo."
+msgid "Last account selected in Join Room dialog"
+msgstr "Zadnji izbran račun v pogovornem oknu pridruženja klepetalnici"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Ali naj se pojavi obvestilo ob vzpostavitvi povezave stika."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Pot predmeta vodila D-Bus zadnjega izbranega računa pri pridruženju klepetalnici."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporočila tudi, kadar je klepetalno okno že odprto, vendar ni v žarišču."
+msgid "Camera device"
+msgstr "Naprava kamere"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Ali naj se pojavi obvestilo ob prejetju novega sporočila."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Privzeta naprava kamere za uporabo pri video klicih, na primer /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Ali naj se v seznamu stikov pokaže tudi stanje na računu."
+msgid "Camera position"
+msgstr "Položaj kamere"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Ali naj bodo podobe stikov prikazane v seznamih in klepetalnih oknih."
+msgid "Position the camera preview should be during a call."
+msgstr "Položaj predogleda kamere med klicem."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Ali naj bodo na seznamu stikov prikazani tudi nepovezani stiki."
+msgid "Echo cancellation support"
+msgstr "Podpora odpravljanju odmevov"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Ali naj bodo pojavna obvestila prikazana ob odsotnosti ali zaposlenosti."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Ali naj se omogoči filter odpravljanja odmevov Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Ali naj bodo v seznamih stikov in klepetalnih oknih prikazani protokoli stikov."
+msgid "Show hint about closing the main window"
+msgstr "Pokaži namig ob zapiranju glavnega okna"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Ali naj bo v klepetalnicah prikazan seznam stikov."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Ali naj bo pogovorno okno sporočila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Ali naj bo v skrčenem pogledu prikazan seznam stikov."
+msgid "Empathy can publish the user's location"
+msgstr "Program Empathy lahko objavi mesto nahajanja uporabnika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Ali naj bo pogovorno okno sporočila o zapiranju glavnega okna prikazano z gumbom 'x' v nazivni vrstici."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Ali naj program Empathy objavlja mesta nahajanja uporabnika njegovim stikom."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Ali naj se za klepetalnice uporablja tema."
+msgid "Empathy can use the network to guess the location"
+msgstr "Program Empathy lahko uporabi omrežje za ugotavljanje mesta nahajanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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."
-msgstr "Kateri kriterij naj se uporabi za razvrščanje seznama stikov. Privzeto je razvrščanje po imenu stika z vrednostjo \"ime\". Vrednost \"stanje\" pa razvrsti seznam glede na stanje stikov."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja omrežje."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Upravljanje s sporočanjem in računi VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Program Empathy lahko uporabi mobilni telefon za ugotavljanje mesta nahajanja"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Sporočanje in računi VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Ali naj Empathy za pridobivanje mesta nahajanja uporablja podatke mobilnega omrežja."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Program Empathy lahko uporabi GPS za ugotavljanje mesta nahajanja"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Ali naj program Empathy za pridobivanje mesta nahajanja uporablja GPS."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Program Empathy naj zmanjša natančnost določevanja nahajanja"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Ali naj program Empathy zaradi zasebnosti zmanjšuje natančnost položaja."
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Ni navedenega vzroka"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Zahtevana je bila zamenjava stanja"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Prenos datoteke ste preklicali"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "Drug uporabnik je preklical prenos datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Prišlo je do napake med prenosom datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "Drug uporabnik ne more prenesti datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:756
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Neznan vzrok"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je končan, vendar je datoteka pokvarjena"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Prenos datotek s strani oddaljenega stika ni podprt"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Izbrana datoteka ni običajna datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Izbrana datoteka je prazna"
 
 #: ../libempathy/empathy-message.c:415
-#: ../src/empathy-call-observer.c:131
+#: ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Zgrešen klic od %s"
@@ -511,166 +535,170 @@ msgstr "Klicanje uporabnika %s"
 msgid "Call from %s"
 msgstr "Klic uporabnika %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Na voljo"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zaposleno"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsotno"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidno"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezano"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ni določenega razloga"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stanje je nastavljeno na brez povezave"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Napaka omrežja"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Overitev ni uspela"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Napaka šifriranja"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ime je v uporabi"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Potrdilo ni na voljo"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Potrdilo ni overjeno"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Potrdilo je preteklo"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Potrdilo ni potrjeno"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Neustrezno potrdilo gostitelja"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Neustrezen prstni odtis potrdila"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Potrdilo je samo-podpisano"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Napaka potrdila"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Šifriranje ni na voljo."
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Potrdilo je neveljavno."
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Omrežna povezava je zavrnjena."
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Povezave ni mogoče vzpostaviti."
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Povezava je prekinjena."
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Vir je s strežnikom že povezan"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Račun je s strežnikom že povezan"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Povezava je zamenjana z novo povezavo, ki uporablja isti vir."
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Račun na strežniku že obstaja"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Strežnik je trenutno preveč zaposlen za upravljanje s povezavo."
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Potrdilo je preklicano"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Potrdilo ne uporablja varnega algoritma ali pa uporablja šibko šifriranje."
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Dolžina potrdila strežnika ali pa globina verige potrdila presega omejitev, ki je določena s šifrirno knjižnico."
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Programska oprema je prestara"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Notranja napaka"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Uporabniki v bližini"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook klepetanje"
 
@@ -732,12 +760,26 @@ msgstr[3] "Pred %d meseci"
 msgid "in the future"
 msgstr "v prihodnosti"
 
+#: ../libempathy/empathy-keyring.c:75
+msgid "Password not found"
+msgstr "Gesla ni mogoče najti"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Geslo računa hipnega sporočanja za %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Geslo za klepetalnico '%s' na računu %s (%s)"
+
 #: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Vsi računi"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Račun"
 
@@ -755,30 +797,30 @@ msgstr "Strežnik"
 msgid "Port"
 msgstr "Vrata"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Uveljavi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Prijava"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ta račun na strežniku že obstaja"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Ustvari nov račun na strežniku"
 
@@ -787,137 +829,137 @@ msgstr "Ustvari nov račun na strežniku"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %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:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s račun"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nov račun"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Primer:</b> Ime Zaslona"
+#: ../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:"
+msgstr "_Geslo:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Screen _Name:"
+msgstr "Zaslonsko _ime:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> Ime Zaslona"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Geslo:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapomni si geslo"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapomni si geslo"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Vrata:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Zapomni si geslo"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Zaslonsko _ime:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Strežnik:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Kakšno je vaše geslo AIM?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Kakšno je vaše zaslonsko ime AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Vrata:"
+msgid "What is your AIM password?"
+msgstr "Kakšno je vaše geslo AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Strežnik:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> uporabniško ime"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapomni si geslo"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "I_D prijave:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> uporabniško ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Kakšen je vaš uporabniški ID GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Kakšno je vaše geslo GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "N_abor znakov:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Kakšen je vaš UIN ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Kakšno je vaše geslo ICQ?"
 
@@ -954,21 +996,25 @@ msgstr "Možnosti"
 msgid "None"
 msgstr "Brez"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Omrežje"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Znakovni nabor:"
+msgid "Network:"
+msgstr "Omrežje:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "Večina strežnikov IRC ne zahteva gesla, zato ga, če niste prepričani, ne uporabite."
+msgid "Character set:"
+msgstr "Znakovni nabor:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Omrežje"
+msgid "Servers"
+msgstr "Strežniki"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Omrežje:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "Večina strežnikov IRC ne zahteva gesla, zato ga, če niste prepričani, ne uporabite."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -986,48 +1032,20 @@ msgstr "Sporočilo končanja:"
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Strežniki"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Kakšen je vaš IRC vzdevek?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Katero IRC omrežje?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Primer:</b> uporabnik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Primer:</b> uporabnik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Zahtevano je šifriranje (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Prezri napake potrdila SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Prepiši nastavitve strežnika"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Prednos_t:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Kakšen je vaš IRC vzdevek?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Vir:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "kakšno je vaše uporabniško ime Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1037,179 +1055,203 @@ msgstr ""
 "V primeru, da ste facebook.com/<b>badger</b>, vnesite <b>badger</b>.\n"
 "Uporabite <a href=\"http://www.facebook.com/username/\">to stran</a> za izbor uporabniškega imena, v kolikor ga še nimate."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Uporabi stari SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Kakšno je vaše geslo Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "kakšno je vaše uporabniško ime Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Kakšen je vaš uporabniški ID Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> uporabnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Kakšno je vaše geslo Google?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> uporabnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Prezri napake potrdila SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Prednos_t:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Vir:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Zahtevano je šifriranje (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Uporabi stari SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Prepiši nastavitve strežnika"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Kakšen je vaš uporabniški ID Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Kakšno je vaše geslo Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Kakšen je vaš želeni uporabniški ID Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Kakšno je vaše geslo Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Kakšno je vaše želeno geslo Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Primer:</b> uporabnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Kakšen je vaš ID Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Kakšno je vaše geslo Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Elektronski _naslov:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Vzdevek:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Priimek:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ime:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Objavljeno ime:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_ID Jabber:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Priimek:"
+msgid "E-_mail address:"
+msgstr "Elektronski _naslov:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Objavljeno ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Uporabniško ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Primer:</b> uporabnik@moj.sip.strežnik"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Uporabniško ime za overitev:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Odkrij povezave"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Samodejno odkrij strežnik STUN"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Uporabi račun za klicanje v daljnovodno omrežje in na mobilne telefone"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Prezri napake TLS"
+msgid "NAT Traversal Options"
+msgstr "Možnosti prečkanja NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Razmik (v sekundah)"
+msgid "Proxy Options"
+msgstr "Možnosti posredniškega strežnika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Možnosti ohranjanja povezave"
+msgid "Miscellaneous Options"
+msgstr "Različne možnosti"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Ohlapno usmerjanje"
+msgid "STUN Server:"
+msgstr "Strežnik STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehanizem:"
+msgid "Discover the STUN server automatically"
+msgstr "Samodejno odkrij strežnik STUN"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Različne možnosti"
+msgid "Discover Binding"
+msgstr "Odkrij povezave"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Možnosti prečkanja NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Strežnik:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Možnosti ohranjanja povezave"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Vrata:"
+msgid "Mechanism:"
+msgstr "Mehanizem:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Možnosti posredniškega strežnika"
+msgid "Interval (seconds)"
+msgstr "Razmik (v sekundah)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Uporabniško ime za overitev:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Prenos:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Strežnik STUN:"
+msgid "Loose Routing"
+msgstr "Ohlapno usmerjanje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Strežnik:"
+msgid "Ignore TLS Errors"
+msgstr "Prezri napake TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Prenos:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Uporabi račun za klicanje v daljnovodno omrežje in na mobilne telefone"
+msgid "Port:"
+msgstr "Vrata:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Kakšno je vaše geslo SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Kakšen je prijavni ID vaše SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Kakšno je vaše geslo SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Prezri vabila na konference in v klepetalnice"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Jezikovne nastavitve seznama klepetalnic:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Kakšen je vaš uporabniški ID Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Kakšno je vaše geslo Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Jezikovne nastavitve seznama klepetalnic:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1247,213 +1289,219 @@ msgstr "Vse datoteke"
 msgid "Click to enlarge"
 msgstr "Kliknite za povečavo"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Prišlo je do napake med začenjanjem klica"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Določen stik ne podpira klicev."
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Izbrani stik ni povezan v omrežje"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Izbrani stik ni veljaven"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Klic v sili ni podprt s tem protokolom"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Na računu ni dovolj visokega zneska za vzpostavitev klica"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Napaka med odpiranjem zasebnega klepeta"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Tema ni podprta pri tem pogovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Za spreminjanje teme nimate ustreznih dovoljenj."
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” ni veljaven ID stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: počisti vsa sporočila trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: določi temo trenutnega pogovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ID klepetalnice>: pridruževanje novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ID klepetalnice>: pridruži se novi klepetalnici"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<ID klepetalnice>] [<razlog>]: zapusti klepetalnico, privzeto je to trenutna klepetalnica"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ID stika> [<sporočilo>]: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ID stika> <sporočilo>: odpre zasebni klepet"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <vzdevek>: spremeni vaš vzdevek na trenutnem strežniku"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <sporočilo>: pošlje sporočilo DEJANJA v trenutni pogovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <sporočilo>: pošlje <sporočilo> v trenutni pogovor. Možnost se uporablja za pošiljanje sporočila, ki se začne z '/'. Primer: \"/say /join se uporablja za pridruževanje novi klepetalnici\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ID stika>: pokaže podrobnosti stika"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<ukaz>], pokaže vse podprte ukaze in njihov način uporabe."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Uporaba: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Neznan ukaz"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Neznan ukaz, za več si vpišite /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "nezadostno stanje na računu za pošiljanje sporočil"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1569
+#: ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Napaka med pošiljanjem sporočila '%s': %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1571
+#: ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Napaka med pošiljanjem sporočila: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "Nezadostno stanje na računi za pošiljanje sporočila. <a href='%s'>Povišaj</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "ni mogoče"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "brez povezave"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "neveljaven stik"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "ni dovoljenja"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "predolgo sporočilo"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "ni del programa"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "neznano"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je določena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s določa vsebino: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Ni določene teme"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Ni predlogov)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj '%s' v slovar"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj '%s' v slovar %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Vstavi smeška"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Pošlji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Predlogi čr_kovalnika"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Napaka med pridobivanjem nedavnih dnevnikov"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je prekinil povezavo"
@@ -1461,12 +1509,12 @@ msgstr "%s je prekinil povezavo"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izgnal %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je bil izgnan"
@@ -1474,17 +1522,17 @@ msgstr "%s je bil izgnan"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je izobčil %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s je izobčen"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je zapustil klepetalnico"
@@ -1494,17 +1542,17 @@ msgstr "%s je zapustil klepetalnico"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je vstopil v klepetalnico"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je preimenovan v %s"
@@ -1512,58 +1560,58 @@ msgstr "%s je preimenovan v %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Prekinjena povezava"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Ali želite shraniti geslo?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Zapomni si"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne zdaj"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Poskusi znova"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Napačno geslo; poskusite znova:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Klepetalnica je zaščitena z geslom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
-#: ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071
+#: ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Pogovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1595,10 +1643,10 @@ msgstr "Uredi blokirane stike"
 #. 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:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Račun:"
 
@@ -1608,7 +1656,7 @@ msgstr "Blokirani stiki"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Odstrani"
@@ -1663,17 +1711,17 @@ msgstr[2] "_Poročaj ta stika kot žaljiva"
 msgstr[3] "_Poročaj te stike kot žaljive"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Odloči se _kasneje"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Zahteva po naročilu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blokiraj_uporabnika"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Odloči se _kasneje"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1828,7 +1876,7 @@ msgstr "Nadmorska višina:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Mesto"
 
@@ -1854,6 +1902,16 @@ msgstr "Shrani podobo"
 msgid "Unable to save avatar"
 msgstr "Ni mogoče shraniti podobe"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Osebne podrobnosti"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Podrobnosti stika"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Polno Ime"
@@ -1919,49 +1977,44 @@ msgstr "poštno"
 msgid "parcel"
 msgstr "paketno"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Mesto</b> na (datum)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Določilo:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Vzdevek:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Podrobnosti odjemalca"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Odjemalec:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Mesto</b> na (datum)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Podrobnosti stika"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Zahtevani podatki ..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Določilo:"
+msgid "Client Information"
+msgstr "Podrobnosti odjemalca"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Zahtevani podatki ..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Različica:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Odjemalec:"
+
 #: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Skupine"
@@ -1980,7 +2033,7 @@ msgid "Select"
 msgstr "Izbor"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1919
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Skupina"
 
@@ -2004,161 +2057,145 @@ msgstr[3] "Naslednjih identitet ni mogoče blokirati:"
 msgid "Edit Contact Information"
 msgstr "Uredi podrobnosti stika"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Povezani stiki"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Izbor stikov za povezovanje"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Nov predogled stika"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
-
 #. 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:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Izbor računa za klicanje"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Kliči"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobilni telefon"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Delo"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Domača mapa"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blokiraj stik"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Klepet"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Zvočni klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Video klic"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:26
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Predhodni po_govori"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Souporaba namizja"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Priljubljeno"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "Paket gnome-contacts ni nameščen"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Namestiti je treba paket gnome-contacts za dostop do podrobnosti stikov."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "_Podrobnosti"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Poveži stike ..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Vabila v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Povabi v klepetalnico"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Dodaj stik ..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Izbriši in _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2339
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Ali zares želite odstraniti skupino '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2342
 msgid "Removing group"
 msgstr "Odstranjevanje skupine"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
 msgid "_Remove"
 msgstr "_Odstrani"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2474
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Ali zares želite odstraniti stik '%s'?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, 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 "Ali res želite odstraniti povezan stik '%s'? S tem bo odstranjeni tudi vsi stiki, ki so opredeljeni kot povezani."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2495
 msgid "Removing contact"
 msgstr "Odstranjevanje stika"
 
@@ -2175,7 +2212,7 @@ msgstr[3] "Povezan stik vključuje %u stike."
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Mesto</b> na (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Povezava je vzpostavljena preko telefona ali druge mobilne naprave"
 
@@ -2204,86 +2241,48 @@ msgstr "nov strežnik"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Poveži stike"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Odstrani povezavo ..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Popolnoma razdeli prikazan povezani stik na posamezne stike."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Povezava"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Ali naj se razdelijo povezani stiki '%s' na posamezne stike?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Ali ste prepričani, da želite odstraniti povezane stike? S tem se bodo stiki razdelil na posamezne stike."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Odstrani povezavo"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Zgodovina"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Pokaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Poišči"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Klepet v %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Klepet s stikom %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %d. %B %Y"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2292,7 +2291,7 @@ msgstr[1] "%s sekunda"
 msgstr[2] "%s sekundi"
 msgstr[3] "%s sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2301,121 +2300,121 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuti"
 msgstr[3] "%s minute"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Klic začet %s, končan %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Danes"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Včeraj"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e. %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Kadarkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Kdorkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Kdo"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kdaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Karkoli"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Besedilni klepet"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Dohodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Odhodni klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Prezrti klici"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Kaj"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Ali ste prepričani, da želite izbrisati vse podatke beležanja predhodnih pogovorov?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Počisti vse"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Izbriši iz:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Nalaganje ...</span>"
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Klepet"
+#: ../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 "_Uredi"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Izbriši celotno zgodovino ..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Klepet"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "_Uredi"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "stran 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Nalaganje ...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Stik ni povezan v omrežje"
@@ -2461,7 +2460,7 @@ msgid "There was an error starting the conversation"
 msgstr "Prišlo je do napake med začenjanjem pogovora"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "Vnesite določilo stika ali pa telefonsko številko:"
 
@@ -2471,17 +2470,17 @@ msgid "New Conversation"
 msgstr "Nov pogovor"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Video klic"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Zvočni klic"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Nov klic"
 
@@ -2537,7 +2536,7 @@ msgstr "Sporočila po meri ..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Nov račun %s"
@@ -2547,20 +2546,20 @@ msgid "Find:"
 msgstr "Najdi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Upoštevaj _velikost črk"
+msgid "_Previous"
+msgstr "_Predhodni"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Rekla ni mogoče najti"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Naslednji"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Upoštevaj _velikost črk"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Predhodni"
+msgid "Phrase not found"
+msgstr "Rekla ni mogoče najti"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2606,12 +2605,12 @@ msgstr "Klic je končan"
 msgid "Edit Custom Messages"
 msgstr "Urejanje sporočila po meri"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Sporočilo je bilo nazadnje spremenjeno ob %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Običajno"
 
@@ -2686,39 +2685,43 @@ msgid "Certificate hostname: %s"
 msgstr "Gostitelj potrdila: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Nadaljuj"
+msgid "C_ontinue"
+msgstr "_Nadaljuj"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepreverjena povezava"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Povezava ni varna. Ali želite vseeno nadaljevati?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapomni si izbor za prihodnje povezave"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Podrobnosti potrdila"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Ni mogoče odpreti naslova URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Izbor datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Ni dovolj prostora za shranjevanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "%s of free space are required to save this file, but only %s is available. Please choose another location."
 msgstr "%s prostora mora biti na voljo za shranjevanje te datoteke, vendar je na voljo le %s. Izbrati bo treba drugo mesto."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Prihajajoča datoteka od %s"
@@ -2898,23 +2901,23 @@ msgstr "Ni sporočil o napakah"
 msgid "Instant Message (Empathy)"
 msgstr "Hipno sporočanje (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Brez samodejne povezave ob zagonu"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Ne prikaži seznama stikov in drugih pogovornih oken ob zagonu"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy sporočilnik"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Napaka delovanja upravljalnika računov"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. The error was:\n"
@@ -2944,203 +2947,77 @@ msgstr "Odjemalec hipnega sporočanja za namizje GNOME"
 msgid "translator-credits"
 msgstr "Matej Urbančič <mateju@svn.gnome.org>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Prišlo je do napake med uvažanjem računov."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Prišlo je do napake med razčlenjevanjem podrobnosti računa."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Prišlo je do napake med ustvarjanjem računa."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Prišlo je do napake."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Sporočilo o napaki je bilo: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Lahko ponovno vnesete podatke svojega računa ali pa končate pomočnika in dodate račune kasneje preko menija Uredi."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Prišlo je do napake"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Kakšno vrsto klepetalnega računa imate?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Ali želite nastaviti še kakšen drug račun?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Vnesite podrobnosti svojega računa"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Kakšne vrste klepetalni račun naj bo ustvarjen?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Ali želite ustvariti druge klepetalne račune?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Vnesite podrobnosti novega računa"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno kamero in mikrofonom lahko uporabljate tudi zvočne ali video klice."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Ali imate račun, ki ste ga uporabljali z drugim programom?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Da, uvoziti želim podrobnosti računa iz"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Da, takoj želim vnesti podrobnosti računa"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Ne, ustvariti želim nov račun"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, želim le videti ljudi, povezane v bližini"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Izbor račune za uvoz:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Da"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Ne, to je trenutno vse"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki istega omrežja. V primeru, da želite uporabljati to možnost, preverite spodnje podatke. Možnosti je mogoče spreminjati tudi kasneje v pogovornemu oknu 'računi'."
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Uredi->Računi"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Te možnosti trenutno _ne želim omogočiti"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Ni mogoče klepetati z uporabniki, povezanimi v krajevnem omrežju, saj paket telepathy-salut ni nameščen. V primeru, da želite to možnost omogočiti, namestite zahtevani paket in ustvarite račun bližnjih uporabnikov med možnostmi računa."
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ni nameščen"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Pomočnik sporočanja in računov VoIP"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Dobrodošli v program Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Uvozite svoje obstoječe račune"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Vnesite osebne podatke"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Obstajajo neshranjene spremembe vašega %s računa."
 
 #. 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:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Novi račun še ni bil shranjen."
 
-#: ../src/empathy-accounts-dialog.c:352
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Povezovanje ..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Brez povezave - %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Prekinjena povezava - %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Brez povezave - ni omrežne povezave"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Neznano stanje"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid "This account has been disabled because it relies on an old, unsupported backend. Please install telepathy-haze and restart your session to migrate the account."
+msgstr "Ta račun je onemogočen, ker deluje na starem, nepodprtem ozadnjem programu. Namestiti je treba paket telepathy-haze in ponovno zagnati sejo za prenos računa."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Brez povezave - račun je onemogočen"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "Uredi parametre povezave"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Pridobivanje osebnih podrobnosti s strežnika je spodletelo."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "Prijava v omrežje za urejanje osebnih podrobnosti."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "_Uredi parametre povezave ..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Ali želite odstraniti %s iz računalnika?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "To ne bo odstranilo vašega računa s strežnika."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3149,15 +3026,23 @@ msgstr ""
 "Ali ste prepričani, da želite nadaljevati?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Omogoči"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "O_nemogoči"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "Pre_skoči"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Poveži"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3169,336 +3054,363 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj ..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Nalaganje podrobnosti računa"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ni nameščenih protokolov"
+msgid "_Import…"
+msgstr "_Uvozi ..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Loading account information"
+msgstr "Nalaganje podrobnosti računa"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "Za dodajanje novega računa morate najprej namestiti zaledje za vsak protokol, ki ga želite uporabiti."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Uvozi ..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Ni nameščenega ozadnjega protokola"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr "- Empathy odjemalec overitve"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Empathy odjemalec overitve"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Uporabniki v bližini"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy odjemalec zvoka in slike"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy odjemalec zvoka in slike"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Svetlost"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Glasnost"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Stranska vrstica"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Zvočni vhod"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video vhod"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Številčnica"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Podrobnosti"
 
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Klic z %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Naslov IP kot ga zazna strojna oprema"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Naslov IP kot ga zazna strežnik v omrežju"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Naslov IP kot ga zazna uporabnik na drugi strani"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Naslov IP posredovalnega strežnika"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Naslov IP skupine za večsmerno oddajanje"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../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
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Neznano"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Povezan - %d:%02d m"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tehnične podrobnosti"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Program stika %s ne prepozna zvočnih zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Program stika %s ne prepozna video zapisov podprtih na vašem sistemu"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Ni mogoče vzpostaviti povezave z %s. Morda je eden od odjemalcev je v omrežju, ki ne dovoli neposrednih povezav."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Prišlo je do napake na omrežju"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Zvočni zapisi za ta klic niso nameščeni"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Video zapisi za ta klic niso nameščeni"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Prišlo je do nepričakovane napake v delu programa Telepathy. Pošljite <a href=\"%s\">poročilo o hrošču</a> in pripnite dnevnik razhroščevanja iz menija pomoči."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Prišlo je do napake v klicnem programniku"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Dosežen je konec pretoka"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ni mogoče vzpostaviti zvočnega pretoka"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ni mogoče vzpostaviti video pretoka"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Zvok"
+msgid "_Call"
+msgstr "Po_kliči"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek odkodiranja:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Onemogoči videokamero"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Pokaži številčnico na zaslonu"
+msgid "_Settings"
+msgstr "_Nastavitve"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek kodiranja:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Pogled"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Odloži"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Pomo_č"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Odloži trenutni klic"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_Vsebina"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Krajevni odjemalec:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Razhroščevanje"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Razpni"
+msgid "Swap camera"
+msgstr "Zamenjaj videokamero"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Skrči"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Oddaljeni odjemalec:"
+msgid "Maximise me"
+msgstr "Razpni"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Pošlji zvočni posnetek"
+msgid "Disable camera"
+msgstr "Onemogoči videokamero"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Pošlji video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Odloži"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Pokaži številčnico"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Odloži trenutni klic"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video klic"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Začni video klic"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Začni zvočni klic"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Zamenjaj videokamero"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Preklopi prenos zvoka"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Preklopi prenos videa"
+msgid "Show dialpad"
+msgstr "Pokaži številčnico"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Neznano"
+msgid "Display the dialpad"
+msgstr "Pokaži številčnico na zaslonu"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Pošlji video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video klic"
+msgid "Toggle video transmission"
+msgstr "Preklopi prenos videa"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "Po_kliči"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Pošlji zvočni posnetek"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Vsebina"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Preklopi prenos zvoka"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Razhroščevanje"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodek kodiranja:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Neznano"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Pomo_č"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek odkodiranja:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Oddaljeni odjemalec:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Nastavitve"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Krajevni odjemalec:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Pogled"
+msgid "Audio"
+msgstr "Zvok"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Ali naj se okno zapre?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr "Z zapiranjem tega okna se prekine tudi povezava s klepetalnico %s. Nadaljnja sporočila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporočila ne bodo prikazana do ponovne povezave."
+msgstr[1] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnico. Nadaljnja sporočila ne bodo prikazana do ponovne povezave."
+msgstr[2] "Z zapiranjem tega okna se prekine tudi povezava z %u klepetalnicama. Nadaljnja sporočila ne bodo prikazana do ponovne povezave."
+msgstr[3] "Z zapiranjem tega okna se prekine tudi povezava s %u klepetalnicami. Nadaljnja sporočila ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Ali naj se prekine povezava s klepetalnico %s?"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr "Nadaljnja sporočila s te klepetalnice ne bodo prikazana do ponovne povezave."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Zapri okno"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Zapusti klepetalnico"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3507,7 +3419,7 @@ msgstr[1] "%s (%d neprebrano)"
 msgstr[2] "%s (%d neprebrani)"
 msgstr[3] "%s (%d neprebrana)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3516,7 +3428,7 @@ msgstr[1] "%s (in %u drugo)"
 msgstr[2] "%s (in %u drugi)"
 msgstr[3] "%s (in %u druga)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3525,7 +3437,7 @@ msgstr[1] "%s (%d neprebrano od drugih)"
 msgstr[2] "%s (%d neprebrani od drugih)"
 msgstr[3] "%s (%d neprebrana od drugih)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3534,11 +3446,11 @@ msgstr[1] "%s (%d neprebrano od vseh)"
 msgstr[2] "%s (%d neprebrani od vseh)"
 msgstr[3] "%s (%d neprebrana od vseh)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3547,70 +3459,70 @@ msgstr[1] "Pošiljanje %d sporočila"
 msgstr[2] "Pošiljanje %d sporočil"
 msgstr[3] "Pošiljanje %d sporočil"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Pisanje sporočila."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "Po_čisti"
+msgid "_Conversation"
+msgstr "_Pogovor"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "S_tik"
+msgid "C_lear"
+msgstr "Po_čisti"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Vstavi _smeška"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Priljubljena klepetalnica"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Povabi _udeleženca ..."
+msgid "Notify for All Messages"
+msgstr "Obvesti o vseh novih sporočilih"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Premakni zavihek _levo"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Pokaži seznam stikov"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Premakni zavihek _desno"
+msgid "Invite _Participant…"
+msgstr "Povabi _udeleženca ..."
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Obvesti o vseh novih sporočilih"
+msgid "C_ontact"
+msgstr "S_tik"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Pogovor"
+msgid "_Tabs"
+msgstr "_Zavihki"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Odpni zavihek"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Priljubljena klepetalnica"
+msgid "_Previous Tab"
+msgstr "_Predhodni zavihek"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Naslednji zavihek"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Predhodni zavihek"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Razveljavi zapiranje zavihka"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Pokaži seznam stikov"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Premakni zavihek _levo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Zavihki"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Premakni zavihek _desno"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Razveljavi zapiranje zavihka"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Odpni zavihek"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3624,106 +3536,106 @@ msgstr "Klepetalnica"
 msgid "Auto-Connect"
 msgstr "Samodejno povezovanje"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Upravljanje priljubljenih klepetalnic"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Dohodni video klic"
 
-#: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas kliče preko video kanala. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas kliče. Ali se želite javiti?"
 
-#: ../src/empathy-event-manager.c:531
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Dohodni klic od %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../src/empathy-event-manager.c:564
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Odgovori"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Odgovori z videom"
 
-#: ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Dohodni video klic od %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Vabilo v klepetalnico"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Povabilo v %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas vabi, da se pridružite v %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas je povabil v %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Povabljeni ste v %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Prihajajoč prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Zahtevano geslo"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s želi dovoljenje za pogled dosegljivosti"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3846,170 +3758,192 @@ msgstr "Prenosi datotek"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "S seznama odstrani končane, preklicane in spodletele prenose datotek"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Uvozi"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "Ni mogoče najti računa za uvoz. Program trenutno podpira le uvoz računov programa Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Uvozi račune"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Uvozi"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Vir"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Vpis gesla"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Ustrezno je treba nastaviti račun za prikaz stikov."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ni najdenih zadetkov."
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "Računov %s ni mogoče uporabljati, dokler ni posodobljena programska oprema %s."
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Posodobitev programske opreme ..."
 
-#: ../src/empathy-roster-window.c:805
-#: ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Zapri"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Ponovno se poveži"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Uredi račun"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Povišaj %s (%s) ..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Povišaj znesek na računu"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Povišaj ..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Stik"
 
-#: ../src/empathy-roster-window.c:2289
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Omogočiti je treba enega izmed računov za prikaz stikov."
+
+#. 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 "Omogočiti je treba račun %s za prikaz stikov."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Seznam stikov"
 
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Stiki na _zemljevidu"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Nastavitve računa"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Stanje na računu"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nov pogovor ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Najdi v _seznamu stikov"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pridruži se _priljubljenim"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Uredi priljubljene"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nov _klic ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "_Običajna velikost"
+msgid "_Search for Contacts…"
+msgstr "Iskanje _stikov ..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nov _klic ..."
+msgid "_File Transfers"
+msgstr "Prenosi _datotek"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Običajna velikost s _podobami"
+msgid "_Offline Contacts"
+msgstr "Nepri_sotni stiki"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "_Možnosti"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Pokaži _protokole"
 
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Razvrsti po _imenu"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Stanje na računu"
 
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Razvrsti po _stanju"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Stiki na _zemljevidu"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Računi"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Blokirani stiki"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Skrčen pogled"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "_Možnosti"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Najdi v _seznamu stikov"
+
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Razvrsti po _imenu"
+
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Razvrsti po _stanju"
+
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Običajna velikost s _podobami"
 
 #: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Prenosi _datotek"
+msgid "N_ormal Size"
+msgstr "_Običajna velikost"
+
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Skrčen pogled"
 
 #: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_Pridruži se"
+msgid "_Room"
+msgstr "_Klepetalnica"
 
 #: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nov pogovor ..."
+msgid "_Join…"
+msgstr "_Pridruži se"
 
 #: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nepri_sotni stiki"
-
-#: ../src/empathy-roster-window-menubar.ui.h:27
-msgid "_Room"
-msgstr "_Klepetalnica"
+msgid "Join _Favorites"
+msgstr "Pridruži se _priljubljenim"
 
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Search for Contacts…"
-msgstr "Iskanje _stikov ..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Uredi priljubljene"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4036,6 +3970,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
@@ -4047,30 +3986,30 @@ msgstr "Seznama klepetalnic ni bilo mogoče začeti"
 msgid "Could not stop room listing"
 msgstr "Seznama klepetalnic ni bilo mogoče dokončati"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Seznama klepetalnic ni bilo mogoče naložiti"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pridruži se klepetalnici"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Vnesite ime klepetalnice, ki se ji želite pridružiti, ali pa kliknite na eno ali več klepetalnic s seznama."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Klepetalnica:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Vnesite gostujoči strežnik klepetalnice ali pa pustite polje prazno, če se klepetalnica nahaja na strežniku računa"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pridruži se klepetalnici"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Seznama klepetalnic ni bilo mogoče naložiti"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Seznam klepetalnic"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Klepetalnica:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Sporočilo je bilo prejeto"
@@ -4084,7 +4023,7 @@ msgid "New conversation"
 msgstr "Nov pogovor"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Stik se je povezal"
 
 #: ../src/empathy-preferences.c:170
@@ -4104,349 +4043,374 @@ msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julija"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O, Romeo, Romeo, zakaj li Romeo?!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Odreci se rodu, odvrzi ime,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "če ne, prisezi večno mi ljubezen,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "in dlje nisem Kapuletova."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Al' bi poslušal še, al govoril? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julija je prekinila povezavo."
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Možnosti"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Pokaži _smeške kot slike"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Pokaži _seznam stikov v klepetalnicah"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Videz"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Obnašanje"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Začni klepet v:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "T_ema klepetanja:"
+msgid "new ta_bs"
+msgstr "novi _zavihki"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Onemogoči obvestila  ob _odsotnosti ali zaposlenosti"
+msgid "new _windows"
+msgstr "nova _okna"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Onemogoči zvok ob _odsotnosti ali zaposlenosti"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaz prihajajočih dogodkov v obvestilnem področju"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Samodejno _poveži ob zagonu "
+
 #: ../src/empathy-preferences.ui.h:9
-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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Odpravljanje odmevov omogoči čistejši zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru, da med pogovorom zaslišite nenavadne zvoke ali šume, onemogočite odpravljanje odmevov in ponovno vzpostavite klic."
+msgid "Log conversations"
+msgstr "Beleži pogovore"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Omogoči obvestila ob prijavah stikov"
+msgid "Behavior"
+msgstr "Obnašanje"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Omogoči obvestila ob odjavah stikov"
+msgid "General"
+msgstr "Splošno"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Omogoči obvestila, kadar _klepetalno okno ni v žarišču"
+msgid "_Enable bubble notifications"
+msgstr "_Omogoči obvestila v oblačkih"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Omogoči preverjanje črkovanja za jezike:"
+msgid "Disable notifications when _away or busy"
+msgstr "Onemogoči obvestila  ob _odsotnosti ali zaposlenosti"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Splošno"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Omogoči obvestila, kadar _klepetalno okno ni v žarišču"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Omogoči obvestila ob prijavah stikov"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Mesta virov:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Omogoči obvestila ob odjavah stikov"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Beleži pogovore"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Obvestila"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Omogoči zvočna obvestila"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Predvajaj zvoke ob dogodkih"
+msgid "Disable sounds when _away or busy"
+msgstr "Onemogoči zvok ob _odsotnosti ali zaposlenosti"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Zasebnost"
+msgid "Play sound for events"
+msgstr "Predvajaj zvoke ob dogodkih"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Zmanjšana natančnost mesta pomeni, da ne bo objavljenih podatkov natančnejših od mesta in države. Koordinate GPS bodo natančne na eno decimalno mesto."
+msgid "Sounds"
+msgstr "Zvoki"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Pokaži _smeške kot slike"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Pokaži _seznam stikov v klepetalnicah"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Zvoki"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Preverjanje črkovanja"
+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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Odpravljanje odmevov omogoči čistejši zvok glasu med klicanjem, vendar pa se lahko na nekaterih sistemih pojavijo težave. V primeru, da med pogovorom zaslišite nenavadne zvoke ali šume, onemogočite odpravljanje odmevov in ponovno vzpostavite klic."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Na seznamu jezikov so le tisti, za katere imate nameščene slovarje."
+msgid "_Publish location to my contacts"
+msgstr "O_bjavi mesto mojim stikom"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Teme"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Uporabi _podporo odpravljanja odmevov za izboljšanje kakovosti klica."
+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 "Zmanjšana natančnost mesta pomeni, da ne bo objavljenih podatkov natančnejših od mesta in države. Koordinate GPS bodo natančne na eno decimalno mesto."
 
+#. 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 "Variant:"
-msgstr "Različica:"
+msgid "_Reduce location accuracy"
+msgstr "_Zmanjšaj natančnost mesta"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "Samodejno _poveži ob zagonu "
+msgid "Privacy"
+msgstr "Zasebnost"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Mobilni telefon"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Omogoči obvestila v oblačkih"
+msgid "_Cellphone"
+msgstr "_Mobilni telefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Omogoči zvočna obvestila"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Omrežje (IP, Wifi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Mesta virov:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "N_ove klepete odpiraj v ločenih oknih"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Na seznamu jezikov so le tisti, za katere imate nameščene slovarje."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "O_bjavi mesto mojim stikom"
+msgid "Enable spell checking for languages:"
+msgstr "Omogoči preverjanje črkovanja za jezike:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Preverjanje črkovanja"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "_Zmanjšaj natančnost mesta"
+msgid "Chat Th_eme:"
+msgstr "T_ema klepetanja:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Različica:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teme"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Končaj"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Znova pokliči stik"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera ni omogočena"
+msgid "Redial"
+msgstr "Ponovno pokliči"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera je omogočena"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video ni omogočen"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Onemogoči kamero in zaustavi pošiljanje videa"
+msgid "Video Preview"
+msgstr "Predogled videa"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Omogoči kamero in začni pošiljati video"
+msgid "Video On"
+msgstr "Video je omogočen"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Omogoči kamero, vendar ne pošlji videa"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Znova pokliči stik"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Predogled"
+msgid "Camera Off"
+msgstr "Kamera ni omogočena"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovno pokliči"
+msgid "Disable camera and stop sending video"
+msgstr "Onemogoči kamero in zaustavi pošiljanje videa"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Predogled"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video ni omogočen"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Omogoči kamero, vendar ne pošlji videa"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video je omogočen"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera je omogočena"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Predogled videa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Omogoči kamero in začni pošiljati video"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Prikaz zemljevida stikov"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Povezava odložišča Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Odziv odložišča Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Preveč je podatkov za enkratno lepljenje. Beleženje dnevnika je priporočljivo shraniti v datoteko."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Razhroščevalno okno"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Pošlji na odložišče Pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Premor"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Razhroščevanje"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Podrobnosti"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050
+#: ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Sporočilo"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritično"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domena"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Raven"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Izbrani upravljalnik povezav ne podpira razširitve za oddaljeno razhroščevanje."
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Povabi udeležence"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izbor stika za povabilo v pogovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:224
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Povabi"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Ne pokaži pogovornih oken; opravi nalogo (na primer: uvažanje) in končaj"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Ne prikaži pogovornega okna, če so na voljo le računov \"uporabnikov v bližini\" "
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Predhodno izberite račun (na primer: gabble/jabber/foo_40primer_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<id-računa>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Pokaži pomočnika za ustvarjanje računov"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy računi"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy računi"
 
@@ -4462,86 +4426,86 @@ msgstr "- razhroščevalnik Empathy"
 msgid "Empathy Debugger"
 msgstr "Empathy razhroščevalnik"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- sporočilnik Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Zavrni"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Odgovori z videom"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Odkloni"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Sprejmi"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Zagotovi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je klical med drugim pogovorom."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136
+#: ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Zadržano"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Trenutno stanje je %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Na računu ni dovolj visokega zneska za vzpostavitev klica."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Povišaj"
 
@@ -4549,10 +4513,179 @@ msgstr "Povišaj"
 msgid "_Match case"
 msgstr "_Upoštevaj velikost črk"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Kakšno vrsto klepetalnega računa imate?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Dodajanje novega računa"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Uporabniki v bližini"
+
+#: ../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."
+msgstr "Program Empathy lahko samodejno odkrije in izmenjuje podatke z uporabniki v istem omrežju. V primeru, da želite uporabljati to možnost, preverite spodnje podatke."
+
+#: ../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 "Te podrobnosti je mogoče spreminjati in onemogočiti tudi kasneje preko menija <span style=\"italic\">Uredi → Računi</span> v seznamu stikov."
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Povezani stiki"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izbor stikov za povezovanje"
+
+#~ msgid "New contact preview"
+#~ msgstr "Nov predogled stika"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Stiki izbrani na seznamu na levi, bodo povezani skupaj."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Poveži stike ..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Poveži stike"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "_Odstrani povezavo ..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Popolnoma razdeli prikazan povezani stik na posamezne stike."
+
+#~ msgid "_Link"
+#~ msgstr "_Povezava"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Ali naj se razdelijo povezani stiki '%s' na posamezne stike?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Ali ste prepričani, da želite odstraniti povezane stike? S tem se bodo "
+#~ "stiki razdelil na posamezne stike."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "_Odstrani povezavo"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Prišlo je do napake med uvažanjem računov."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Prišlo je do napake med razčlenjevanjem podrobnosti računa."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Prišlo je do napake med ustvarjanjem računa."
+
+#~ msgid "There was an error."
+#~ msgstr "Prišlo je do napake."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Sporočilo o napaki je bilo: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Lahko ponovno vnesete podatke svojega računa ali pa končate pomočnika in "
+#~ "dodate račune kasneje preko menija Uredi."
+
+#~ msgid "An error occurred"
+#~ msgstr "Prišlo je do napake"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Ali želite nastaviti še kakšen drug račun?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Vnesite podrobnosti svojega računa"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Kakšne vrste klepetalni račun naj bo ustvarjen?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Ali želite ustvariti druge klepetalne račune?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Vnesite podrobnosti novega računa"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "S programom Empathy lahko klepetate s posamezniki, ki uporabljajo Google "
+#~ "Talk, AIM, Windows Live in mnogo drugih klepetalnih programov. S spletno "
+#~ "kamero in mikrofonom lahko uporabljate tudi zvočne ali video klice."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Ali imate račun, ki ste ga uporabljali z drugim programom?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Da, uvoziti želim podrobnosti računa iz"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Da, takoj želim vnesti podrobnosti računa"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, ustvariti želim nov račun"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ne, želim le videti ljudi, povezane v bližini"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izbor račune za uvoz:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, to je trenutno vse"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Uredi->Računi"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Te možnosti trenutno _ne želim omogočiti"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ni mogoče klepetati z uporabniki, povezanimi v krajevnem omrežju, saj "
+#~ "paket telepathy-salut ni nameščen. V primeru, da želite to možnost "
+#~ "omogočiti, namestite zahtevani paket in ustvarite račun bližnjih "
+#~ "uporabnikov med možnostmi računa."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Pomočnik sporočanja in računov VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Dobrodošli v program Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Uvozite svoje obstoječe račune"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Vnesite osebne podatke"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Pokaži pomočnika za ustvarjanje računov"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "N_ove klepete odpiraj v ločenih oknih"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "Vrsta vtičnice ni podprta"
 
diff --git a/po/sr.po b/po/sr.po
index 693635676..5ea6375f6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,5 +1,5 @@
 # Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the Empathy package.
 # From Pidgin translation:
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,528 +11,582 @@
 # Reviewed on 11.05.2009 by Милош Поповић <gpopac@gmail.com>
 # Милош Поповић <gpopac@gmail.com>, 2010.
 # Бранко Кокановић <branko.kokanovic@gmail.com>, 2011.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-13 08:42+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Ћаскајте на Гугл разговору, Фејсбуку, МСН-у и на многим другим сервисима за "
-"ћаскање"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Интернет писмоноша"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Програм за брзе поруке"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Дописивање преко Интернет писмоноше"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Програм за брзе поруке"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ћаскајте на Гугл разговору, Фејсбуку, МСН-у и на многим другим сервисима за "
+"ћаскање"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Налози за дописивање и VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Управљајте налозима за дописивање и ВоИП"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Увек отвара посебан прозор за нова ћаскања."
+msgid "Connection managers should be used"
+msgstr "Да ли ће бити коришћен управник мрежом"
 
+# Није connect већ disconnect!!! ~Милош
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Јачина звука позива"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Да ли треба користити управника мреже за аутоматско прекидање и поновно "
+"успостављање везе."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Јачина звука позива, у процентима."
+msgid "Empathy should auto-connect on startup"
+msgstr "Да ли Писмоноша да сам успоставити везу по покретању"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Уређај камерице"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Да ли Писмоноша да се сам пријави на постојеће налоге након покретања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Положај камерице"
+msgid "Empathy should auto-away when idle"
+msgstr "Да ли Писмоноша да пређе у стање аутоматског одсуства у мировању"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Знак за додавање после надимка када се користи аутоматско довршавање надимка "
-"(таб) у групним ћаскањима."
+"Да ли Писмоноша да аутоматски пређе у стање одсуства приликом мировања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Тема прозора за ћаскање"
+msgid "Empathy default download folder"
+msgstr "Писмоношина подразумевана фасцикла за преузимања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Варијанта теме прозора за ћаскање"
+msgid "The default folder to save file transfers in."
+msgstr "Подразумевана фасцикла за чување пренесених датотека."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Списак језика одвојен зарезима које користи провера правописа (нпр. „sr, en, "
-"fr“)."
+"Магичан број коришћен за проверу ако задаци чишћења исправности треба да "
+"буду покренути"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Збијени списак пријатеља"
+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."
+msgstr ""
+"„empathy-sanity-cleaning.c“ (чишћење исправности интернет писмоноше) користи "
+"овај број да провери да ли задаци чишћења треба да буду извршени или не. "
+"Корисници не треба ручно да мењају овај кључ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Да ли ће бити коришћен управник мрежом"
+msgid "Show offline contacts"
+msgstr "Приказује пријатеље ван мреже"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Критеријум за сортирање пријатеља"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Да ли да приказује неповезане пријатеље у списку пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Основна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
-"video0“."
+msgid "Show avatars"
+msgstr "Приказује слике"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Подразумевана фасцикла за избор слике"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Искључује искачућа обавештења када смо одсутни"
+msgid "Show protocols"
+msgstr "Приказује протоколе"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Онемогућава звуке када смо одсутни"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Приказује долазне догађаје на линији стања"
+msgid "Show Balance in contact list"
+msgstr "Приказује готовину на списку пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Приказује долазне догађаје на линији стања. Ако није постављено, одмах их "
-"приказује кориснику."
+msgid "Whether to show account balances in the contact list."
+msgstr "Да ли да приказује износ готовине налога у списку пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Подршка за уклањање одјека"
+msgid "Compact contact list"
+msgstr "Збијени списак пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Да ли Писмоноша сме да објављује локацију корисника"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Да ли да приказује списак пријатеља у збијеном режиму."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију"
+msgid "Hide main window"
+msgstr "Сакрива главни прозор"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију"
+msgid "Hide the main window."
+msgstr "Сакрива главни прозор програма."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију"
+msgid "Default directory to select an avatar image from"
+msgstr "Подразумевана фасцикла за избор слике"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Писмоношина подразумевана фасцикла за преузимања"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Последња фасцикла из које је изабрана слика."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Писмоноша је пребацио дневнике из лептира"
+msgid "Open new chats in separate windows"
+msgstr "Отвара нова ћаскања у различитим прозорима"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Да ли Писмоноша да пређе у стање аутоматског одсуства у мировању"
+msgid "Always open a separate chat window for new chats."
+msgstr "Увек отвара посебан прозор за нова ћаскања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Да ли Писмоноша да сам успоставити везу по покретању"
+msgid "Display incoming events in the status area"
+msgstr "Приказује долазне догађаје на линији стања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Да ли Писмоноша да умањи прецизност локације"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Приказује долазне догађаје на линији стања. Ако није постављено, одмах их "
+"приказује кориснику."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Да ли Писмоноша да користи слику пријатеља као иконицу прозора за ћаскање"
+msgid "The position for the chat window side pane"
+msgstr "Положај бочне површи прозора за ћаскање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Омогућава Веб кит развојне алате"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћаскање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Омогућава искачућа обавештења за нове поруке"
+msgid "Show contact groups"
+msgstr "Приказује групе контакта"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Омогућава проверу писања"
+msgid "Whether to show groups in the contact list."
+msgstr "Да ли да приказује групе у списку контакта."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Сакрива главни прозор"
+msgid "Contact list sort criterion"
+msgstr "Критеријум за сортирање пријатеља"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Сакрива главни прозор програма."
+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 ""
+"Који критеријум се користи за сортирање списка пријатеља. Подразумевано се "
+"користи „state“ (сортирање по стању пријатеља). Ако је вредност „name“, "
+"сортирање се врши по имену пријатеља."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Знак за довршавање надимка"
+msgid "Use notification sounds"
+msgstr "Користи звукове за обавештења"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Отвара нова ћаскања у различитим прозорима"
+msgid "Whether to play a sound to notify of events."
+msgstr "Да ли да пусти обавештајни звук за догађаје."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Путања до Адијум теме за коришћење"
+msgid "Disable sounds when away"
+msgstr "Онемогућава звуке када смо одсутни"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Путања до Адијум теме за коришћење, ако се користи Адијум тема за ћаскање."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Да ли да пусти обавештајни звук када постанете заузети или одсутни."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Пушта звук за долазеће поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Пушта звук за нове разговоре"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Да ли да пусти обавештајни звук када вам стигне порука."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Пушта звук за одлазеће поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Пушта звук када се пријатељ пријави"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Да ли да пусти обавештајни звук када пошаљете поруку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Пушта звук када се пријатељ одјави"
+msgid "Play a sound for new conversations"
+msgstr "Пушта звук за нове разговоре"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Пушта звук када се ја пријавим"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Да ли да пусти обавештајни звук на нови разговор."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Пушта звук када се ја одјавим"
+msgid "Play a sound when a contact logs in"
+msgstr "Пушта звук када се пријатељ пријави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Исписује обавештења ако ћаскање није у фокусу"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Да ли да пусти обавештајни звук када се пријатељи пријаве на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Исписује обавештења када се пријатељ пријави"
+msgid "Play a sound when a contact logs out"
+msgstr "Пушта звук када се пријатељ одјави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Исписује обавештења када се пријатељ одјави"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Да ли да пусти обавештајни звук када се пријатељи одјаве са мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Положај приказа камерице за време позива."
+msgid "Play a sound when we log in"
+msgstr "Пушта звук када се ја пријавим"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Приказује готовину на списку пријатеља"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Да ли да пусти звук када се пријавите на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Приказује слике"
+msgid "Play a sound when we log out"
+msgstr "Пушта звук када се ја одјавим"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Приказује списак пријатеља у собама"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Да ли да пусти звук када се одјавите са мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Приказује савет у вези затварања главног прозора"
+msgid "Enable popup notifications for new messages"
+msgstr "Омогућава искачућа обавештења за нове поруке"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Приказује пријатеље ван мреже"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Приказује протоколе"
+msgid "Disable popup notifications when away"
+msgstr "Искључује искачућа обавештења када смо одсутни"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Језици за проверу писања"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Да ли да приказује облачић обавештења када сте заузети или одсутни."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Подразумевана фасцикла за чување пренесених датотека."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Исписује обавештења ако ћаскање није у фокусу"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Последња фасцикла из које је изабрана слика."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Да ли да приказује облачић обавештења са пристиглим порукама чак и када је "
+"прозор за ћаскање отворен, али није у фокусу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Положај бочне површи прозора за ћаскање"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Исписује обавештења када се пријатељ пријави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Сачуван положај (у тачкама) бочне површи прозора за ћаскање."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Да ли да приказује облачић обавештења када се пријатељ пријави на мрежу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Тема за приказ разговора у прозору ћаскања."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Исписује обавештења када се пријатељ одјави"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Варијанта теме која се користи за приказ разговора у прозору ћаскања."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Да ли да приказује облачић обавештења када се пријатељ одјави са мреже."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Приказује сличицу са смешком"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Користи звукове за обавештења"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Да ли да приказује смешке као сличице унутар разговора."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Користи теме за собе ћаскања"
+msgid "Show contact list in rooms"
+msgstr "Приказује списак пријатеља у собама"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Да ли Писмоноша да објављује локацију корисника његовим пријатељима."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Да ли да приказује списак пријатеља у собама за ћаскање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију."
+msgid "Chat window theme"
+msgstr "Тема прозора за ћаскање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Тема за приказ разговора у прозору ћаскања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију."
+msgid "Chat window theme variant"
+msgstr "Варијанта теме прозора за ћаскање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Да ли је Писмоноша пребацио дневнике из лептира."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варијанта теме која се користи за приказ разговора у прозору ћаскања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Да ли Писмоноша да се сам пријави на постојеће налоге након покретања."
+msgid "Path of the Adium theme to use"
+msgstr "Путања до Адијум теме за коришћење"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Да ли Писмоноша да аутоматски пређе у стање одсуства приликом мировања."
+"Путања до Адијум теме за коришћење, ако се користи Адијум тема за ћаскање."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Да ли Писмоноша да умањи прецизност локације због повећане приватности."
+msgid "Enable WebKit Developer Tools"
+msgstr "Омогућава Веб кит развојне алате"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Да ли Писмоноша да користи слику пријатеља као икону у прозору ћаскања."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Да ли ће бити омогућени Веб кит развојни алати, као што је Веб Инспектор."
 
-# Није connect већ disconnect!!! ~Милош
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Обавештава остале кориснике када им пишете поруку"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Да ли треба користити управника мреже за аутоматско прекидање и поновно "
-"успостављање везе."
+"Да ли ће да пошаље стања ћаскања „саставља“ или „паузиран“. Неће утицати на "
+"стање „отишао“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Да ли да проверава писање речи за изабране језике."
+msgid "Use theme for chat rooms"
+msgstr "Користи теме за собе ћаскања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Да ли да приказује смешке као сличице унутар разговора."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Да ли да користи тему за собе разговора."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Да ли ће бити укључен филтер Пулсе аудиа за уклањање одјека."
+msgid "Spell checking languages"
+msgstr "Језици за проверу писања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Да ли да пусти обавештајни звук када се пријатељи пријаве на мрежу."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Списак језика одвојен зарезима које користи провера правописа (нпр. „sr, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Да ли да пусти обавештајни звук када се пријатељи одјаве са мреже."
+msgid "Enable spell checker"
+msgstr "Омогућава проверу писања"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Да ли да пусти обавештајни звук за догађаје."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Да ли да проверава писање речи за изабране језике."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Да ли да пусти обавештајни звук када вам стигне порука."
+msgid "Nick completed character"
+msgstr "Знак за довршавање надимка"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Да ли да пусти обавештајни звук на нови разговор."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Знак за додавање после надимка када се користи аутоматско довршавање надимка "
+"(таб) у групним ћаскањима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Да ли да пусти обавештајни звук када пошаљете поруку."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Да ли Писмоноша да користи слику пријатеља као иконицу прозора за ћаскање"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Да ли да пусти звук када се пријавите на мрежу."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Да ли Писмоноша да користи слику пријатеља као икону у прозору ћаскања."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Да ли да пусти звук када се одјавите са мреже."
+msgid "Last account selected in Join Room dialog"
+msgstr "Последњи изабрани налог у прозорчету за придруживање соби"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Да ли да пусти обавештајни звук када постанете заузети или одсутни."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Путања објекта Д-баса последњег налога изабраног за придруживање соби"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Да ли да приказује облачић обавештења када се пријатељ одјави са мреже."
+msgid "Camera device"
+msgstr "Уређај камерице"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Да ли да приказује облачић обавештења када се пријатељ пријави на мрежу."
+"Основна видео камерица која ће бити коришћена у видео позивима, нпр. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Да ли да приказује облачић обавештења са пристиглим порукама чак и када је "
-"прозор за ћаскање отворен, али није у фокусу."
+msgid "Camera position"
+msgstr "Положај камерице"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Да ли да приказује облачић обавештења када примите нову поруку."
+msgid "Position the camera preview should be during a call."
+msgstr "Положај приказа камерице за време позива."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Да ли да приказује износ готовине налога у списку пријатеља."
+msgid "Echo cancellation support"
+msgstr "Подршка за уклањање одјека"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Да ли ће бити укључен филтер Пулсе аудиа за уклањање одјека."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Да ли да приказује неповезане пријатеље у списку пријатеља."
+msgid "Show hint about closing the main window"
+msgstr "Приказује савет у вези затварања главног прозора"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Да ли да приказује облачић обавештења када сте заузети или одсутни."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Да ли да приказује поруку о затварању главног прозора када га затворите на "
+"„x“ дугме."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Да ли да приказује слике за пријатеље у списку пријатеља и прозору ћаскања."
+msgid "Empathy can publish the user's location"
+msgstr "Да ли Писмоноша сме да објављује локацију корисника"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Да ли да приказује списак пријатеља у собама за ћаскање."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Да ли Писмоноша да објављује локацију корисника његовим пријатељима."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Да ли да приказује списак пријатеља у збијеном режиму."
+msgid "Empathy can use the network to guess the location"
+msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Да ли да приказује поруку о затварању главног прозора када га затворите на "
-"„x“ дугме."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Да ли Писмоноша сме да користи мрежу да погоди локацију."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Да ли да користи тему за собе разговора."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Да ли Писмоноша сме да користи мобилну мрежу да погоди локацију."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Да ли Писмоноша сме да користи ГПС да погоди локацију."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Да ли Писмоноша да умањи прецизност локације"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Који критеријум се користи за сортирање списка пријатеља. Подразумевано се "
-"користи „name“ (сортирање по имену пријатеља). Ако је вредност „state“, "
-"сортирање се врши по стању пријатеља."
+"Да ли Писмоноша да умањи прецизност локације због повећане приватности."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Управљајте налозима за дописивање и ВоИП"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Није наведен разлог"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Налози за дописивање и VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Захтевана је промена стања"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Обуставили сте пренос датотеке"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Друга страна је прекинула пренос датотеке"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Грешка приликом преноса датотеке"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Друга страна није у могућности да пренесе датотеку"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Непознат разлог"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Пренос датотеке је завршен, али је датотека оштећена"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Друга страна не подржава пренос датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Изабрана датотека није обична датотека"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Изабрана датотека је празна"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропуштен позив од %s"
@@ -548,169 +602,138 @@ msgstr "Позив корисника %s"
 msgid "Call from %s"
 msgstr "Позив од %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Врста прикључка није подржана"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Није наведен разлог"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Захтевана је промена стања"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Обуставили сте пренос датотеке"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Друга страна је прекинула пренос датотеке"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Грешка приликом преноса датотеке"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Друга страна није у могућности да пренесе датотеку"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Непознат разлог"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Доступан"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Одсутан"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Невидљив"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Неповезан"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Није наведен разлог"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Стање је постављено на „неповезан“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Грешка у мрежи"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Неуспешна пријава"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Грешка при шифровању"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Име је у употреби"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертификат није прослеђен"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертификат није од поверења"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертификат је истекао"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертификат није активиран"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Име домаћина сертификата се не поклапа"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Отисак сертификата се не поклапа"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Сертификат је самопотписан"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Грешка у сертификату"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифровање није доступно"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертификат није исправан"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Веза је одбијена"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Веза не може да се успостави"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Веза је изгубљена"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Овај ресурс је већ повезан са сервером"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Овај налог је већ повезан са сервером"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Веза је замењена новом везом користећи исти ресурс"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Овај налог већ постоји на серверу"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер је тренутно превише заузет да би успоставио везу"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертификат је опозван"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертификат користи небезбедни алгоритам шифровања или је криптографски слаб"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -718,42 +741,49 @@ msgstr ""
 "Дужина сертификата сервера, или дубина ланца сертификата сервера премашује "
 "границе библиотеке за шифровање"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Ваш софтвер је превише стар"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Унутрашња грешка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Људи у околини"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Јаху! Јапан"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Гугл разговор"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Фејсбук ћаскање"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "Пре %d секунде"
+msgstr[0] "Пре %d секунд"
 msgstr[1] "Пре %d секунде"
 msgstr[2] "Пре %d секунди"
 msgstr[3] "Пре једне секунде"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "Пре %d минута"
+msgstr[0] "Пре %d минут"
 msgstr[1] "Пре %d минута"
 msgstr[2] "Пре %d минута"
 msgstr[3] "Пре једног минута"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +792,7 @@ msgstr[1] "Пре %d сата"
 msgstr[2] "Пре %d сати"
 msgstr[3] "Пре једног сата"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -771,7 +801,7 @@ msgstr[1] "Пре %d дана"
 msgstr[2] "Пре %d дана"
 msgstr[3] "Пре једног дана"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -780,7 +810,7 @@ msgstr[1] "Пре %d недеље"
 msgstr[2] "Пре %d недеља"
 msgstr[3] "Пре једне недеље"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -789,224 +819,211 @@ msgstr[1] "Пре %d месеца"
 msgstr[2] "Пре %d месеци"
 msgstr[3] "Пре једног месеца"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "у будућности"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Лозинка није пронађена"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Лозинка ТП налога за %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Лозинка за причаоницу „%s“ на налогу %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Сви налози"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Налог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Лозинка"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Моји веб налози"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Налог %s је измењен путем %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Налог %s не може бити уређиван из Писмоноше."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Покрени Моје веб налоге"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Измени %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Примени"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Пријави _ме"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Овај налог већ постоји на серверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Направи нови налог на серверу"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "По_ништи"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s налог"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Нови налог"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Пример:</b> МојНадимак"
+#: ../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:"
+msgstr "_Лозинка:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Напредно"
+msgid "Screen _Name:"
+msgstr "_Надимак:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Пример:</b> МојНадимак"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Лозинка:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запамти лозинку"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Порт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Запамти лозинку"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Надимак:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Која је ваша АИМ лозинка?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Напредно"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Који је ваш АИМ надимак?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Порт:"
+msgid "What is your AIM password?"
+msgstr "Која је ваша АИМ лозинка?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Пример:</b> корисничко_име"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запамти лозинку"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_Корисничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Пример:</b> корисничко_име"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Који је ваш Гроуп Вајз кориснички ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Која је ваша Гроуп Вајз лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ИЦКу _КИБ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Пример:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Кодни р_аспоред:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ИЦКу _КИБ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Који је ваш ИЦКу КИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Која је ваша ИЦКу лозинка?"
 
@@ -1043,11 +1060,23 @@ msgstr "Опције"
 msgid "None"
 msgstr "Ништа"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Мрежа"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Мрежа:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Кодни распоред:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Сервери"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1055,14 +1084,6 @@ msgstr ""
 "Већина ИРЦ сервера не тражи лозинку, зато ако нисте сигурни, немојте је "
 "уносити."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Мрежа"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Мрежа:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Надимак:"
@@ -1079,48 +1100,20 @@ msgstr "Порука за крај:"
 msgid "Real name:"
 msgstr "Право име:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Сервери"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Који је ваш ИРЦ надимак?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Која ИРЦ мрежа?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Пример:</b> korisnik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Пример:</b> korisnik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Захтева се _шифровање(TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Занемари грешке ССЛ сертификата"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Превазиђи поставке сервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Приоритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Који је ваш ИРЦ надимак?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Ресурс:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Које је ваше Фејсбук корисничко име?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1132,179 +1125,203 @@ msgstr ""
 "Уколико немате корисничко име за Фејсбук, идите на <a href=\"http://www."
 "facebook.com/username/\">ову страну</a> да га изаберете."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Користи стари СС_Л"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Која је ваша Фејсбук лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Које је ваше Фејсбук корисничко име?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Који је ваш Гугл ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Пример:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Која је ваша Гугл лозинка?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Пример:</b> korisnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Занемари грешке ССЛ сертификата"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Приоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Ресурс:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Захтева се _шифровање(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Користи стари СС_Л"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Превазиђи поставке сервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Који је ваш Џабер ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Која је ваша Џабер лозинка?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Који је ваш жељени Џабер ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Која је ваша Џабер лозинка?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Која ја ваша жељена Џабер лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Пример:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Који је ваш Виндоуз Уживо ИБ ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Која је ваша Виндоуз Уживо лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Адреса _е-поште:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Надимак:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Презиме:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Име:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Име за _објаву:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Џабер ИД:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Презиме:"
+msgid "E-_mail address:"
+msgstr "Адреса _е-поште:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Име за _објаву:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Корисничко име:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Пример:</b> korisnik@moj.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Корисничко име за пријаву:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Откриј повезивања"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Аутоматски откриј СТУН сервер"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Користи овај налог за позиве _линијских и мобилних телефона"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Занемари ТЛС грешке"
+msgid "NAT Traversal Options"
+msgstr "Опције проласка кроз НАТ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Период (у секундама)"
+msgid "Proxy Options"
+msgstr "Опције посредника"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Опције за одржавање сталне везе"
+msgid "Miscellaneous Options"
+msgstr "Разне опције"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Слабо рутирање"
+msgid "STUN Server:"
+msgstr "СТУН сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механизам:"
+msgid "Discover the STUN server automatically"
+msgstr "Аутоматски откриј СТУН сервер"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Разне опције"
+msgid "Discover Binding"
+msgstr "Откриј повезивања"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Опције проласка кроз НАТ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Опције за одржавање сталне везе"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механизам:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Опције посредника"
+msgid "Interval (seconds)"
+msgstr "Период (у секундама)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Корисничко име за пријаву:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Транспорт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "СТУН сервер:"
+msgid "Loose Routing"
+msgstr "Слабо рутирање"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Занемари ТЛС грешке"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Транспорт:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Користи овај налог за позиве _линијских и мобилних телефона"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Која је лозинка за ваш СИП налог?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Која је идентификација за СИП пријаву?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Корисничко име:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Која је лозинка за ваш СИП налог?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Јаху! И_Б:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Занемари позивнице за причаонице и конференције"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Лок_ални списак соба:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Који је ваш Јаху! ИБ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Која је ваша Јаху! лозинка?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Јаху! И_Б:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Лок_ални списак соба:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1342,84 +1359,88 @@ msgstr "Све датотеке"
 msgid "Click to enlarge"
 msgstr "Кликните да увећате"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Дошло је до грешке приликом позивања"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Наведени контакт не подржава позиве"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Наведени контакт није на вези"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Наведени контакт није исправан"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Овај протокол не подржава хитне позиве"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Немате довољно кредита да бисте могли да обавите овај позив"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Нисам успео да отворим приватно ћаскање"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Теме нису подржане у овом разговору"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Није вам дозвољено да промените тему"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "„%s“ није исправан ИБ контакта"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: чисти све поруке из овог разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <тема>: поставља тему тренутног разговора"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ИБ собе>: прикључује се новој соби за ћаскање"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ИБ собе>: прикључује се новој соби за ћаскање"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<ИБ собе>] [<разлог>]: напушта собу за ћаскање, подразумевано тренутну"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ИБ пријатеља> [<порука>]: отвара приватно ћаскање"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ИБ пријатеља> <порука>: отвара приватно ћаскање"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <надимак>: мења ваш надимак на тренутном серверу"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <порука>: шаље поруку РАДЊА на тренутни разговор"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1429,11 +1450,11 @@ msgstr ""
 "порука које почињу са „/“. На пример: „/say /join се користи за прикључивање "
 "у нову собу за ћаскање“"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ИБ контакта>: приказује податке о контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1462,126 @@ msgstr ""
 "/help [<команда>]: приказује све подржане наредбе. Ако се да и конкретна "
 "<наредба>, приказује њено упутство за употребу."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Коришћење: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Непозната наредба"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Непозната наредба; погледајте /help за доступне наредбе"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "нема довољно готовине за слање поруке"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Грешка при слању поруке „%s“: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Грешка при слању поруке: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "нема довољно готовине за слање поруке. <a href='%s'>Допуните</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "неспособан"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "неповезан"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "неисправан пријатељ"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "приступ је забрањен"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "порука је предуга"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "није подржано"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "непознато"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Грешка при слању поруке „%s“: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Грешка при слању поруке: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема је постављена на: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Тему је поставио %s на: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Тема није постављена"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(нема предлога)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Додај „%s“ у речник"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додај „%s“ у речник за %s језик"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Убаци смешак"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Пошаљи"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Предлози правопи_са"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Нисам успео да преузмем скорашње дневнике"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s је отишао са везе"
@@ -1555,12 +1589,12 @@ msgstr "%s је отишао са везе"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s је избацио корисника %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s је избачен"
@@ -1568,17 +1602,17 @@ msgstr "%s је избачен"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s је забранио приступ кориснику %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "Кориснику %s је забрањен приступ"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s је напустио(ла) причаоницу"
@@ -1588,17 +1622,17 @@ msgstr "%s је напустио(ла) причаоницу"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s је приступио(ла) причаоници"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s је сада познат као %s"
@@ -1606,90 +1640,90 @@ msgstr "%s је сада познат као %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:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Веза је прекинута"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Да ли желите да запамтите ову лозинку?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Запамти"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Не сада"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Покушај поново"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Погрешна лозинка, покушајте поново:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ова соба је заштићена лозинком:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Прикључи се"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Повезан"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Разговор"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (СМС)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Непознати или неисправан идентификатор"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Блокирање пријатеља је тренутно недоступно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Блокирање пријатеља није доступно"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Приступ је забрањен"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Не могу да блокирам пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Измени блокиране пријатеље"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Налог:"
 
@@ -1699,63 +1733,54 @@ msgstr "Блокирани пријатељи"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Уклони"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Умножи адресу везе"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Отвори везу"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Измени податке контакта"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Подаци о профилу"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Нови пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Блокирати %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
 "Да ли сте сигурни да желите да блокирате да вас „%s“ више не контактира?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Блокирај"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "П_ријави овај контакт за злоупотребу"
@@ -1764,401 +1789,315 @@ msgstr[2] "П_ријави ове контакте за злоупотребу"
 msgstr[3] "П_ријави овај контакт за злоупотребу"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Од_лучи касније"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Захтев за претплату"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Блокирај корисника"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Негруписано"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Омиљени људи"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Да ли сте сигурни да желите да уклоните групу „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Уклањам групу"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Да ли сте сигурни да желите да уклоните пријатеља „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Уклањам пријатеља"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Дод_ај пријатеља…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Блокирај контакт"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Ћа_скање"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Аудио позив"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Видео позив"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Претходни разговори"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Пошаљи датотеку"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Подели моју радну површ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Омиљени"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Подаци"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Изм_ени"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Позивам вас у ову собу"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Позов_и у собу за ћаскање"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Од_лучи касније"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Претражи контакте"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Претрага:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Дод_ај пријатеља"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Није пронађен ниједан пријатељ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Порука која вас представља:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Молим вас обавестите не када сте на мрежи. Хвала!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Изаберите пријатеља"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Пуно име:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Број телефона:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Адреса е-поште:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Веб страница:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Рођендан:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Виђен пре:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Повезан са:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Порука за одсутност:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ИСО код државе:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Држава:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Република:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Град:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Област:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Поштански код:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Зграда:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Спрат:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Текст:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Адреса:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Ниво тачности:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Усправна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Водоравна грешка (у метрима):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Правац:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Брзина пењања:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Последњи пут ажурирано:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Географска дужина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Географска ширина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Висина:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Локација"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y у %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Сачувај слику"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Не могу да сачувам слику"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Локација</b> у (датум)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Надимак:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Подаци о клијенту"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Програм:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Лични подаци"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Детаљи о пријатељу"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Име и презиме"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Број телефона"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Адреса ел. поште"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Веб страница"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Рођендан"
+
+#. 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 "Виђен пре:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Повезан са:"
+
+#. 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 "Порука за одсутност:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "посао"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "кућа"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "мобилни"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "гласовни"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "првенствени"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "поштански"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "пошиљка"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Идентификатор:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Надимак:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Локација</b> у (датум)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Захтевани су подаци…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Подаци о клијенту"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Издање:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Програм:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Групе"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +2105,21 @@ msgstr ""
 "Изаберите групе у којима желите да се пријатељ налази.  Приметите да можете "
 "да одаберете и више група као и ниједну."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Дод_ај групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Изабери"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Следећи идентитет ће бити блокиран:"
@@ -2188,7 +2127,7 @@ msgstr[1] "Следећи идентитети ће бити блокирани:
 msgstr[2] "Следећи идентитети ће бити блокирани:"
 msgstr[3] "Следећи идентитет ће бити блокиран:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Следећи идентитет не може бити блокиран:"
@@ -2196,79 +2135,144 @@ msgstr[1] "Следећи идентитети не могу бити блоки
 msgstr[2] "Следећи идентитети не могу бити блокирани:"
 msgstr[3] "Следећи идентитет не може бити блокиран:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Повезани пријатељи"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Изаберите пријатеља за повезивање"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Преглед новог пријатеља"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Означени пријатељи на списку лево ће бити увезани заједно."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Измени податке контакта"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Изаберите налог који ће бити коришћен за позив"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Позив"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобилни"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Посао"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "КУЋА"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Блокирај контакт"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "Ћа_скање"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_СМС"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Аудио позив"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Видео позив"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Претходни разговори"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Пошаљи датотеку"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Подели моју радну површ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Омиљени"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "програм гномови контакти није инсталиран"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Инсталирајте „gnome-contacts“ да приступите подацима контаката."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Подаци"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Уреди"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Повежи контакте…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Позивам вас у ову собу"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Позов_и у собу за ћаскање"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Дод_ај пријатеља…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Избриши и _блокирај"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Да ли сте сигурни да желите да уклоните групу „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Уклањам групу"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Да ли сте сигурни да желите да уклоните пријатеља „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2277,7 +2281,11 @@ msgstr ""
 "Да ли стварно желите да уклоните увезани контакт „%s“? Ово ће уклонити и све "
 "контакте који су везани за овај контакт."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Уклањам пријатеља"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2290,23 +2298,23 @@ msgstr[3] "Увезани пријатељ садржи један контак�
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Локација</b> у (датум)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "На вези преко телефона или мобилног уређаја"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Нова мрежа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Одаберите ИРЦ мрежу"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Ресетуј _мрежни списак"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Изабери"
@@ -2319,91 +2327,48 @@ msgstr "нови сервер"
 msgid "SSL"
 msgstr "ССЛ"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Повежи пријатеље"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Развежи…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Раздваја увезане контакте у посебне пријатеље."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Увежи"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Да развежем увезаног пријатеља „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Да ли сте сигурни да желите да развежете увезаног пријатеља? Овим ћете "
-"раздвојити увезане контакте у посебне пријатеље."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Развежи"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Историјат"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Прикажи"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Потражи"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Ћаскање у %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Ћаскање са %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2412,7 +2377,7 @@ msgstr[1] "%s секунде"
 msgstr[2] "%s секунди"
 msgstr[3] "једне секунде"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2421,151 +2386,197 @@ msgstr[1] "%s минута"
 msgstr[2] "%s минута"
 msgstr[3] "једног минута"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Позив је започет %s, а завршен је %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Данас"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Било кад"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Било ко"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Ко"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Када"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Било шта"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Писана ћаскања"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Долазни позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Одлазећи позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропуштени позиви"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Шта"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Да ли сте сигурни да желите да обришете све дневнике претходних разговора?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Очисти све"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Обриши од:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Учитавам...</span>"
+msgid "_File"
+msgstr "_Датотека"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Ћаскање"
+#: ../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 "Изм_ени"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Обриши сав историјат..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профил"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Видео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Ћаскање"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Изм_ени"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Видео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "страна 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ИБ пријатеља:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Учитавам...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ћ_аскај"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Контакт није на вези"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Наведени контакт или је неисправан или непознат"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Контакт не подржава ову врсту разговора"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Захтевана функционалност није примењена за овај протокол"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Не могу да започнем разговор са датим контактом"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Избачени сте са овог канала"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Овај канал је пун"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Морате бити позвани да се придружите овом каналу"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Не могу да наставим док је веза прекинута"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Забрањен приступ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Дошло је до грешке приликом започињања разговора"
+
+#: ../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 "Унесите одредник контакта или телефонски број:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Нови разговор"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Пошаљи _видео"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Видео позив"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Позови"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Аудио позив"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Нови позив"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Није успело потврђивање идентитета за налог <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"
@@ -2602,12 +2613,8 @@ msgstr "Кликните да поставите ову поруку стања
 msgid "Set status"
 msgstr "Постави стање"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Поставите ваше присуство и тренутно стање"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Произвољне поруке…"
 
@@ -2615,7 +2622,7 @@ msgstr "Произвољне поруке…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Нови %s налог"
@@ -2625,20 +2632,20 @@ msgid "Find:"
 msgstr "Тражи:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Упореди величину слова"
+msgid "_Previous"
+msgstr "_Претходно"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Израз није пронађен"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Следеће"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Упореди величину слова"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Претходно"
+msgid "Phrase not found"
+msgstr "Израз није пронађен"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,12 +2691,12 @@ msgstr "Позив за разговор је завршен"
 msgid "Edit Custom Messages"
 msgstr "Уреди произвољне поруке"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Порука је уређена %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Нормално"
 
@@ -2766,34 +2773,38 @@ msgid "Certificate hostname: %s"
 msgstr "Име домаћина сертификата: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Настави"
+msgid "C_ontinue"
+msgstr "_Настави"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Неповерљива веза"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ова веза није од поверења. Желите ли ипак да наставите?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запамти овај избор за наредне везе"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Детаљи сертификата"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Не могу да отворим адресу"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Нема довољно слободног места за чување датотеке"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,7 +2813,7 @@ msgstr ""
 "Потребно је %s за снимање ове датотеке, али је доступно само %s. Одаберите "
 "друго место за снимање."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Долазећа датотека од %s"
@@ -2974,40 +2985,32 @@ msgstr "западни"
 msgid "Vietnamese"
 msgstr "вијетнамски"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Изабрани пријатељ не може да прими датотеке."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Изабрани пријатељ није на вези."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Нема порука о грешкама"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Брза порука (Писмоноша)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Не повезуј се по покретању"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Не приказуј списак пријатеља нити било које друго прозорче по покретању"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— Интернет писмоноша за брзе поруке"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Грешка при комуникацији са Управником налога"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3055,11 +3058,11 @@ msgstr ""
 "адресу: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Гномов програм за брзе поруке"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Данило Шеган <dsegan@gmx.net>\n"
@@ -3071,222 +3074,83 @@ msgstr ""
 "\n"
 "Превод.орг — превод на српски језик."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Грешка при увожењу налога."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Грешка при обради детаља налога."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Грешка при прављењу налога."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Догодила се грешка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Исписана порука грешке: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Можете се или вратити и пробати да поново унесете детаље налога или да "
-"затворите помоћника и додате налоге касније из менија „Измени“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Дошло је до грешке"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Који тип налога за ћаскање имате?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Да ли имате још неки налог за ћаскање који желите да подесите?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Унесите детаље налога"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Који тип налога за ћаскање желите да направите?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Да ли желите да направите још налога за ћаскање?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Унесите детаље новог налога"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Са Интернет Писмоношом можете ћаскати и са људима у близини и са пријатељима "
-"и колегама који користе Гугл разговор, АИМ, Виндоуз уживо и многе друге "
-"програме за ћаскање. Са микрофоном и камером такође можете да обављате и "
-"аудио и видео позиве."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Да ли имате налог који сте користили са неким другим програмом за ћаскање?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Да, увези детаље мог налога из "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Да, ја ћу сам унети детаље налога"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Не, желим нови налог"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Не, за сада само желим да видим људе у близини"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Изаберите налоге које желите да увезете:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Да"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Не, то је све за сада"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Писмоноша може аутоматски да открије и ћаска са људима који су повезани на "
-"исту мрежу као и ви. Ако желите да користите ову могућност, проверите да ли "
-"су детаљи испод тачни. Лако их можете изменити касније или искључити ову "
-"могућност из прозорчета „Налози“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Измени->Налози"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "За сада _не желим да користим ову могућност"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Не могу да ћаскам са људима повезаним на вашу локалну мрежу јер telepathy-"
-"salut није инсталиран. Ако желите да омогућите ово, инсталирајте пакет "
-"telepathy-salut и направите налог „Људи у околини“ из прозорчета „Налози“."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut није инсталиран"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Асистент налога за брзе поруке и ВоИП"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Добродошли у Интернет Писмоношу"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Увезите ваше постојеће налоге"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Унесите личне податке"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Постоје несачуване измене на вашем налогу %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Ваш нови налог још није сачуван."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Повезујем се…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Неповезан — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Веза је прекинута — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Неповезан — Нема мрежне конекције"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Непознато стање"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Овај налог је искључен зато што се заснива на старом, неподржаном позадинцу. "
+"Инсталирајте „telepathy-haze“ и поново покрените вашу сесију да преместите "
+"налог."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Неповезан — Налог је онемогућен"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Овим ћете направити нови налог, занемаривши унете измене.\n"
-"Да ли сигурно желите да наставите?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Уредите параметре повезивања"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Нисам успео да довучем ваше личне податке са сервера."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Успоставите везу да уредите ваше личне податке."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Уреди параметре повезивања..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Да ли сте сигурни да желите да уклоните „%s“ са вашег рачунара?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ово неће уклонити ваш налог на серверу."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3159,23 @@ msgstr ""
 "Да ли сигурно желите да наставите?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "О_немогући"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Прескочи"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Повежи се"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3187,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Додај…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Учитавам податке о налогу"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Ниједан протокол није инсталиран"
+msgid "_Import…"
+msgstr "_Увези…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Учитавам податке о налогу"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,148 +3203,132 @@ msgstr ""
 "Да додате нови налог, прво морате да инсталирате прикључке за све протоколе "
 "које желите да користите."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Увези…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Нису инсталирани позадинци протокола"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — Интернет писмоноша клијент пријаве"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Интернет писмоноша клијент пријаве"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Људи у околини"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "— Интернет писмоноша Аудио/Видео клијент"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Интернет писмоноша Аудио/Видео клијент"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Контраст"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Осветљеност"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Гама"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Јачина звука"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Бочна површ"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Звучни улаз"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Видео улаз"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Бројчаник"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Детаљи"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Позив са корисником %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "ИП адреса како је види овај рачунар"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ИП адреса како је види сервер на интернету"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ИП адреса вршњака како је види друга страна"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "ИП адреса релејног сервера"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "ИП адреса групе за вишеструко емитовање"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Непознато"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Непознато"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Непознато"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Непознато"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Повезан — %d:%02dм"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Технички детаљи"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Програм %s не разуме ниједан звучни формат који подржава ваш рачунар"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Програм %s не разуме ниједан видео формат који подржава ваш рачунар"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3337,27 @@ msgstr ""
 "Не могу да успоставим везу са %s. Можда је неко од вас двоје на мрежи која "
 "не дозвољава директне везе."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Дошло је до грешке у мрежи"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Звучни формати потребни за овај позив нису инсталирани на вашем рачунару"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Видео формати потребни за овај позив нису инсталирани на вашем рачунару"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3368,216 @@ msgstr ""
 "\">ову грешку</a> и прикачите дневнике покупљене из прозора „Отклањање "
 "грешака“ у менију „Помоћ“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Дошло је до грешке у мотору за позиве"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Достигнут је крај тока"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Не могу да успоставим звучни ток"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Не могу да успоставим видео ток"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Аудио"
+msgid "_Call"
+msgstr "_Позови"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Кодек за декодирање:"
+msgid "_Microphone"
+msgstr "Ми_крофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Искључите камерицу"
+msgid "_Camera"
+msgstr "_Камерица"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Прикажите бројчаник"
+msgid "_Settings"
+msgstr "По_дешавања"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодек за кодирање:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "Пре_глед"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Прекини"
+#: ../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 "По_моћ"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Прекините тренутни позив"
+#: ../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 "_Садржај"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локални кандидат:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Отклањање _грешака"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Увећај ме"
+msgid "Swap camera"
+msgstr "Размени камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Умањи ме"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Удаљени кандидат:"
+msgid "Maximise me"
+msgstr "Увећај ме"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Пошаљи звук"
+msgid "Disable camera"
+msgstr "Искључите камерицу"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Пошаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Прекини"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Прикажи бројчаник"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Прекините тренутни позив"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Видео позив"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Започните видео позив"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Започните аудио позив"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Размени камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Укључи/искључи пренос звука"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Укључи/искључи пренос видеа"
+msgid "Show dialpad"
+msgstr "Прикажи бројчаник"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Непознато"
+msgid "Display the dialpad"
+msgstr "Прикажите бројчаник"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Пошаљи видео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Видео позив"
+msgid "Toggle video transmission"
+msgstr "Укључи/искључи пренос видеа"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Позови"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Пошаљи звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камерица"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Садржај"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Укључи/искључи пренос звука"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Отклањање _грешака"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодек за кодирање:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "По_моћ"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Непознато"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Кодек за декодирање:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Ми_крофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Удаљени кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "По_дешавања"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локални кандидат:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Пре_глед"
+msgid "Audio"
+msgstr "Аудио"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Да затворим овај прозор?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Затварањем овог прозора биће напуштено %s. Нећете примати никакве будуће "
+"поруке све док се поново не придружите."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Затварањем овог прозора биће напуштена %u соба за ћаскање. Нећете примати "
+"никакве будуће поруке све док се поново не придружите."
+msgstr[1] ""
+"Затварањем овог прозора биће напуштене %u собе за ћаскање. Нећете примати "
+"никакве будуће поруке све док се поново не придружите."
+msgstr[2] ""
+"Затварањем овог прозора биће напуштено %u соба за ћаскање. Нећете примати "
+"никакве будуће поруке све док се поново не придружите."
+msgstr[3] ""
+"Затварањем овог прозора биће напуштена једна соба за ћаскање. Нећете примати "
+"никакве будуће поруке све док се поново не придружите."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Да напустим %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Нећете примати никакве будуће поруке из ове собе за ћаскање све док јој се "
+"поново не придружите."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Затвори прозор"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Напусти собу"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3679,7 +3586,7 @@ msgstr[1] "%s (%d непрочитане)"
 msgstr[2] "%s (%d непрочитаних)"
 msgstr[3] "%s (једна непрочитана)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3688,7 +3595,7 @@ msgstr[1] "%s (и %u друге)"
 msgstr[2] "%s (и %u других)"
 msgstr[3] "%s (и једна друга)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3697,7 +3604,7 @@ msgstr[1] "%s (%d непрочитане од осталих)"
 msgstr[2] "%s (%d непрочитаних од осталих)"
 msgstr[3] "%s (једна непрочитана од осталих)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3706,11 +3613,11 @@ msgstr[1] "%s (%d непрочитане од свих)"
 msgstr[2] "%s (%d непрочитаних од свих)"
 msgstr[3] "%s (једна непрочитана од свих)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "СМС:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3719,69 +3626,69 @@ msgstr[1] "Шаљем %d поруке."
 msgstr[2] "Шаљем %d порука."
 msgstr[3] "Шаљем једну поруку"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Пише поруку."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Очисти"
+msgid "_Conversation"
+msgstr "_Разговор"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Пријатељ"
+msgid "C_lear"
+msgstr "_Очисти"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Убаци _смешак"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Омиљена соба за _ћаскање"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Позови _учеснике…"
+msgid "Notify for All Messages"
+msgstr "Обавести за све поруке"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Премести језичак _лево"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Прикажи _списак пријатеља"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Премести језичак _десно"
+msgid "Invite _Participant…"
+msgstr "Позови _учеснике…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Обавести за све поруке"
+msgid "C_ontact"
+msgstr "_Пријатељ"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Разговор"
+msgid "_Tabs"
+msgstr "_Листови"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Откачи лист"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Омиљена соба за _ћаскање"
+msgid "_Previous Tab"
+msgstr "_Претходни лист"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Следећи лист"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Претходни лист"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Опозови затварање језичка"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Прикажи _списак пријатеља"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Премести језичак _лево"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Листови"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Премести језичак _десно"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Опозови затварање језичка"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Откачи лист"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3795,100 +3702,100 @@ msgstr "Соба"
 msgid "Auto-Connect"
 msgstr "Аутоматско повезивање"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Уреди омиљене собе"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Долазни видео позив"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Долазни позив"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s вас зове видео позивом. Желите ли да се јавите?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s вас зове. Желите ли да се јавите?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Долазни позив од %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Одбаци"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Јави се"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Одговори са _видеом"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Долазни видео позив од %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Позивнице за собу"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Позивница да се придружите у %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s вас позива да се придружите %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Прикључи се"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s вас позива да се придружите %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Позвани сте да се придружите у %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Долазни пренос датотеке од %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Захтевана је лозинка"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s тражи одобрење да види када сте на вези"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3898,105 +3805,105 @@ msgstr ""
 "Порука: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s од %s при %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Примам „%s“ од %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Шаљем „%s“ за %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Грешка при примању „%s“ од %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Грешка при примању датотеке"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Грешка при слању „%s“ за %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Грешка при слању датотеке"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ је примљен од %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ је послат за %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Пренос датотеке је завршен"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Чекам на одговор друге стране"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Проверавам интегритет датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Тражим хеш датотеке „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Преостало"
 
@@ -4008,7 +3915,11 @@ msgstr "Преноси датотека"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Уклони завршене, отказане и неуспешне преносе датотека са списка"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Увези"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3927,198 @@ msgstr ""
 "Нисам пронашао ниједан налог за увоз. Интернет писмоноша тренутно подржава "
 "само увожење налога из Пиџина."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Увезите налоге"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Увези"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Извор"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Унесите лозинку"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Веза је прекинута"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Морате да подесите налог да бисте овде видели контакте."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Нема поклапања"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Извините, %s налози не могу бити коришћени све док не ажурирате ваш %s "
+"софтвер."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Ажурирај софтвер..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Затвори"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Поново се повежи"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Измени налог"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Затвори"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Допуни %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Допуните кредит налога"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Допуни..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Пријатељ"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Морате да укључите један од ваших налога да бисте овде видели контакте."
+
+#. 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 "Морате да укључите %s да бисте овде видели контакте."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Списак пријатеља"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Пријатељи на _мапи"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Подешавања налога"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Износ готовине"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Нови разговор…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Пронађи у _списку пријатеља"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Нови _позив…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Придружи се _омиљеним"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Тражи пријатеље…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Уреди омиљене"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Преноси _датотека"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Н_ормална величина"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Неп_овезани пријатељи"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Нови _позив…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Прикажи _протоколе"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Нормална величина са _аватарима"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Износ готовине"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Пријатељи на _мапи"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "Н_алози"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Блокирани пријатељи"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Поставке"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Прикажи _протоколе"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Пронађи у _списку пријатеља"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Поређај према _имену"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Поређај према _стању"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "Н_алози"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Нормална величина са _аватарима"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Блокирани пријатељи"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Н_ормална величина"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Компактна величина"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Преноси _датотека"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Соба"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Прикључи се…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Нови разговор…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Неп_овезани пријатељи"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Лични _подаци"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Соба"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Придружи се _омиљеним"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Тражи пријатеље…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Уреди омиљене"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Соба за ћаскање"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Чланови"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4131,27 @@ msgstr ""
 "Потребна лозинка: %s\n"
 "Чланови: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Не"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Не могу да покренем листање списка соба"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Не могу да зауставим листање списка соба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Не могу да учитам списак соба"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Придружи се соби"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4160,10 @@ msgstr ""
 "Овде унесите име собе за придруживање или кликните на неку од соба на списку."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Соба:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4224,505 +4171,829 @@ msgstr ""
 "Унесите сервер који угошћава собе, или оставите празно ако су собе на "
 "серверу на којем вам је налог"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Придружи се соби"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Не могу да учитам списак соба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Списак соба"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Соба:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Порука је примљена"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Порука је послата"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Нови разговор"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Пријатељ се пријавио"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Пријатељ се одјавио"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Налог је на вези"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Налог није на вези"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Језик"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Паја"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Јаре"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Јао, куме, готов сам!! Ја сам бивши човек!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Пајо, шта је било, Пајооо??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Како шта је било?? Нема је више, украли су ми је!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Шта су ти украли, Пајо?? Штаааа??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Како шта?? Ама лађу, украли су ми лађу!! Јао мени!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Сав очајан, Паја је прекинуо везу."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Поставке"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Прикажи слике _смешака"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Прикажи списак _пријатеља у собама"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Изглед"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Понашање"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Започни ћаскања у:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Тема ћаскања:"
+msgid "new ta_bs"
+msgstr "новим _језичцима"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Искључи обавештења када сам _одсутан или заузет"
+msgid "new _windows"
+msgstr "новим _прозорима"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Искључи звуке када сам _одсутан или заузет"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Прикажи долазне догађаје у обавештајној зони"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Сам се повежи након покретања"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Уклањање одјека чини да ваш глас другој особи звучи јасније, али може да "
-"изазове проблеме на неким рачунарима. Ако ви или ваш саговорник чујете чудне "
-"шумове или крчање за време позива, покушајте да искључите уклањање одјека и "
-"поново покрените позив."
+msgid "Log conversations"
+msgstr "Забележи разговоре"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Омогући обавештења када пријатељ дође на мрежу"
+msgid "Behavior"
+msgstr "Понашање"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Омогући обавештења када пријатељ оде са мреже"
+msgid "General"
+msgstr "Опште"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Омогући обавештења када _ћаскања нису у фокусу"
+msgid "_Enable bubble notifications"
+msgstr "_Омогући обавештења у облачићима"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Омогући проверу правописа за следеће језике:"
+msgid "Disable notifications when _away or busy"
+msgstr "Искључи обавештења када сам _одсутан или заузет"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Опште"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Омогући обавештења када _ћаскања нису у фокусу"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Улазни ниво:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Омогући обавештења када пријатељ дође на мрежу"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Јачина улазног звука:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Омогући обавештења када пријатељ оде са мреже"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Обавештења"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Извори локација:"
+msgid "_Enable sound notifications"
+msgstr "Омогући _звучна обавештења"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Забележи разговоре"
+msgid "Disable sounds when _away or busy"
+msgstr "Искључи звуке када сам _одсутан или заузет"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Обавештења"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Пусти звук за догађаје"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Звуци"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Приватност"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Користи уклањање _одјека да побољшаш квалитет позива"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Умањена тачност локације значи да ће најтачнији објављени подаци о вашој "
-"локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Прикажи слике _смешака"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Прикажи списак _пријатеља у собама"
+"Уклањање одјека чини да ваш глас другој особи звучи јасније, али може да "
+"изазове проблеме на неким рачунарима. Ако ви или ваш саговорник чујете чудне "
+"шумове или крчање за време позива, покушајте да искључите уклањање одјека и "
+"поново покрените позив."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Звуци"
+msgid "_Publish location to my contacts"
+msgstr "Објави локацију мојим _пријатељима"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Провера писања"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"Овај списак језика представља само оне језике за које имате инсталиране "
-"речнике."
+"Умањена тачност локације значи да ће најтачнији објављени подаци о вашој "
+"локацији бити град и држава.  ГПС координате ће бити тачне до 1. децимале."
 
+#. 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 "Themes"
-msgstr "Теме"
+msgid "_Reduce location accuracy"
+msgstr "Умањи _тачност локације"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Варијанта:"
+msgid "Privacy"
+msgstr "Приватност"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Сам се повежи након покретања"
+msgid "_GPS"
+msgstr "_ГПС"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Мобилни телефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Омогући обавештења у облачићима"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Мрежа (ИП, бежична)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Омогући _звучна обавештења"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_ГПС"
+msgid "Location sources:"
+msgstr "Извори локација:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Мрежа (ИП, бежична)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Овај списак језика представља само оне језике за које имате инсталиране "
+"речнике."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Отварај ћаскања у новим прозорима"
+msgid "Enable spell checking for languages:"
+msgstr "Омогући проверу правописа за следеће језике:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Објави локацију мојим _пријатељима"
+msgid "Spell Checking"
+msgstr "Провера писања"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Тема ћаскања:"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "Умањи _тачност локације"
+msgid "Variant:"
+msgstr "Варијанта:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Теме"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стање"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Позови пријатеља поново"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Искљ. камеру"
+msgid "Redial"
+msgstr "Поново зови"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Укљ. камеру"
+msgid "V_ideo"
+msgstr "В_идео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Искљ. видео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Онемогући камеру и престани да шаљеш видео"
+msgid "Video Preview"
+msgstr "Преглед видеа"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Омогући камеру и шаљи видео"
+msgid "Video On"
+msgstr "Укљ. видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Омогући камеру, али не шаљи видео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Позови пријатеља поново"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Преглед"
+msgid "Camera Off"
+msgstr "Искљ. камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Поново зови"
+msgid "Disable camera and stop sending video"
+msgstr "Онемогући камеру и престани да шаљеш видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "В_идео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Преглед"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Искљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Омогући камеру, али не шаљи видео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Укљ. видео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Укљ. камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Преглед видеа"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Омогући камеру и шаљи видео"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Мапа пријатеља"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Сачувај"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Веза канте одлагања"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Одговор канте одлагања"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Подаци су превелики за једно одлагање. Сачувајте записнике у датотеку."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Прозор за отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Пошаљи у канту одлагања"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
-msgstr "Ниво: "
+msgstr "Ниво "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Отклањање грешака"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Информације"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критичан"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Грешка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Време"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категорија"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Ниво"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Изабрани управник везе не подржава проширење за удаљено отклањање грешака."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Позови учеснике"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Изаберите пријатеља за позивање у овај разговор:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Позови"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Не приказуј ниједно прозорче; уради посао који имаш (нпр. увожење) и изађи"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Не приказуј ниједно прозорче осим ако не постоје само налози „Људи у близини“"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Почетно изабирање датог налога (нпр. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<идентификација налога>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Налози Писмоноше"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Налози Писмоноше"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Прикажи посебну услугу"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— Отклањање грешака Писмоноше"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Отклањање грешака Писмоноше"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— Писмоноша програм за ћаскање"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Одговори"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Одбаци"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Јави се"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Одговори са видеом"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Одбиј"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прихвати"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Обезбеди"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s је покушао да вас зове, али сте ви били на другој вези."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "и"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "На чекању"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Утишај"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Трајање"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Ваше тренутно стање је %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Извините, али немате довољно кредита за овај позив."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Допуни"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Упореди величину слова"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Који тип налога за ћаскање имате?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Додајем нови налог"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Људи у околини"
+
+#: ../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."
+msgstr ""
+"Писмоноша може аутоматски да открије и ћаска са људима који су повезани на "
+"исту мрежу као и ви. Ако желите да користите ову могућност, проверите да ли "
+"су детаљи испод тачни."
+
+#: ../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 ""
+"Можете касније да измените те детаље или да искључите ову могућност тако што "
+"ћете изабрати <span style=\"italic\">Уреди → Налози</span> са списка "
+"контаката."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Грешка при увожењу налога."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Грешка при обради детаља налога."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Грешка при прављењу налога."
+
+#~ msgid "There was an error."
+#~ msgstr "Догодила се грешка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Исписана порука грешке: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Можете се или вратити и пробати да поново унесете детаље налога или да "
+#~ "затворите помоћника и додате налоге касније из менија „Измени“."
+
+#~ msgid "An error occurred"
+#~ msgstr "Дошло је до грешке"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Да ли имате још неки налог за ћаскање који желите да подесите?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Унесите детаље налога"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Који тип налога за ћаскање желите да направите?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Да ли желите да направите још налога за ћаскање?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Унесите детаље новог налога"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Са Интернет Писмоношом можете ћаскати и са људима у близини и са "
+#~ "пријатељима и колегама који користе Гугл разговор, АИМ, Виндоуз уживо и "
+#~ "многе друге програме за ћаскање. Са микрофоном и камером такође можете да "
+#~ "обављате и аудио и видео позиве."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Да ли имате налог који сте користили са неким другим програмом за ћаскање?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Да, увези детаље мог налога из "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Да, ја ћу сам унети детаље налога"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Не, желим нови налог"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Не, за сада само желим да видим људе у близини"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Изаберите налоге које желите да увезете:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Не, то је све за сада"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Измени->Налози"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "За сада _не желим да користим ову могућност"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Не могу да ћаскам са људима повезаним на вашу локалну мрежу јер telepathy-"
+#~ "salut није инсталиран. Ако желите да омогућите ово, инсталирајте пакет "
+#~ "telepathy-salut и направите налог „Људи у околини“ из прозорчета „Налози“."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut није инсталиран"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Асистент налога за брзе поруке и ВоИП"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Добродошли у Интернет Писмоношу"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Увезите ваше постојеће налоге"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Унесите личне податке"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Приказује помоћника налога"
+
+#~ msgid "Call volume"
+#~ msgstr "Јачина звука позива"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Јачина звука позива, у процентима."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Писмоноша је пребацио дневнике из лептира"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Да ли је Писмоноша пребацио дневнике из лептира."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Врста прикључка није подржана"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Моји веб налози"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Налог %s је измењен путем %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Налог %s не може бити уређиван из Писмоноше."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Покрени Моје веб налоге"
+
+#~ msgid "Edit %s"
+#~ msgstr "Измени %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "По_ништи"
+
+#~ msgid "Personal Information"
+#~ msgstr "Подаци о профилу"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Негруписано"
+
+#~ msgid "Favorite People"
+#~ msgstr "Омиљени људи"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Изм_ени"
+
+#~ msgid "Select a contact"
+#~ msgstr "Изаберите пријатеља"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Повезани пријатељи"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Изаберите пријатеља за повезивање"
+
+#~ msgid "New contact preview"
+#~ msgstr "Преглед новог пријатеља"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Означени пријатељи на списку лево ће бити увезани заједно."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Повежи контакте…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Повежи пријатеље"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Развежи…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Раздваја увезане контакте у посебне пријатеље."
+
+#~ msgid "_Link"
+#~ msgstr "_Увежи"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Да развежем увезаног пријатеља „%s“?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Да ли сте сигурни да желите да развежете увезаног пријатеља? Овим ћете "
+#~ "раздвојити увезане контакте у посебне пријатеље."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Развежи"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ИБ пријатеља:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ћ_аскај"
+
+#~ msgid "Send _Video"
+#~ msgstr "Пошаљи _видео"
+
+#~ msgid "C_all"
+#~ msgstr "_Позови"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Поставите ваше присуство и тренутно стање"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Изабрани пријатељ не може да прими датотеке."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Изабрани пријатељ није на вези."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Овим ћете направити нови налог, занемаривши унете измене.\n"
+#~ "Да ли сигурно желите да наставите?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Непознато"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Непознато"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Непознато"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Непознато"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Лични _подаци"
+
+#~ msgid "Input level:"
+#~ msgstr "Улазни ниво:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Јачина улазног звука:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Отварај ћаскања у новим прозорима"
+
 #~ msgid "All"
 #~ msgstr "Све"
 
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 4c3713bbf..d136d7213 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -1,5 +1,5 @@
 # Serbian translation of Empathy
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003-2009.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
 # This file is distributed under the same license as the Empathy package.
 # From Pidgin translation:
 # Danilo Segan <dsegan@gmx.net>, 2003, 2004, 2005.
@@ -11,528 +11,582 @@
 # Reviewed on 11.05.2009 by Miloš Popović <gpopac@gmail.com>
 # Miloš Popović <gpopac@gmail.com>, 2010.
 # Branko Kokanović <branko.kokanovic@gmail.com>, 2011.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath"
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-12 11:23+0000\n"
+"PO-Revision-Date: 2012-03-13 08:42+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
-"ćaskanje"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Internet pismonoša"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Program za brze poruke"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Dopisivanje preko Internet pismonoše"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Program za brze poruke"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Ćaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
+"ćaskanje"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Nalozi za dopisivanje i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Upravljajte nalozima za dopisivanje i VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Uvek otvara poseban prozor za nova ćaskanja."
+msgid "Connection managers should be used"
+msgstr "Da li će biti korišćen upravnik mrežom"
 
+# Nije connect već disconnect!!! ~Miloš
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "Jačina zvuka poziva"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
+"uspostavljanje veze."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "Jačina zvuka poziva, u procentima."
+msgid "Empathy should auto-connect on startup"
+msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "Uređaj kamerice"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "Položaj kamerice"
+msgid "Empathy should auto-away when idle"
+msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka "
-"(tab) u grupnim ćaskanjima."
+"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema prozora za ćaskanje"
+msgid "Empathy default download folder"
+msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Varijanta teme prozora za ćaskanje"
+msgid "The default folder to save file transfers in."
+msgstr "Podrazumevana fascikla za čuvanje prenesenih datoteka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
-"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, "
-"fr“)."
+"Magičan broj korišćen za proveru ako zadaci čišćenja ispravnosti treba da "
+"budu pokrenuti"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Zbijeni spisak prijatelja"
+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."
+msgstr ""
+"„empathy-sanity-cleaning.c“ (čišćenje ispravnosti internet pismonoše) koristi "
+"ovaj broj da proveri da li zadaci čišćenja treba da budu izvršeni ili ne. "
+"Korisnici ne treba ručno da menjaju ovaj ključ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Da li će biti korišćen upravnik mrežom"
+msgid "Show offline contacts"
+msgstr "Prikazuje prijatelje van mreže"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kriterijum za sortiranje prijatelja"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
-"video0“."
+msgid "Show avatars"
+msgstr "Prikazuje slike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Podrazumevana fascikla za izbor slike"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "Isključuje iskačuća obaveštenja kada smo odsutni"
+msgid "Show protocols"
+msgstr "Prikazuje protokole"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "Onemogućava zvuke kada smo odsutni"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Prikazuje dolazne događaje na liniji stanja"
+msgid "Show Balance in contact list"
+msgstr "Prikazuje gotovinu na spisku prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih "
-"prikazuje korisniku."
+msgid "Whether to show account balances in the contact list."
+msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "Podrška za uklanjanje odjeka"
+msgid "Compact contact list"
+msgstr "Zbijeni spisak prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju"
+msgid "Hide main window"
+msgstr "Sakriva glavni prozor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju"
+msgid "Hide the main window."
+msgstr "Sakriva glavni prozor programa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju"
+msgid "Default directory to select an avatar image from"
+msgstr "Podrazumevana fascikla za izbor slike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "Pismonošina podrazumevana fascikla za preuzimanja"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Poslednja fascikla iz koje je izabrana slika."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "Pismonoša je prebacio dnevnike iz leptira"
+msgid "Open new chats in separate windows"
+msgstr "Otvara nova ćaskanja u različitim prozorima"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Da li Pismonoša da pređe u stanje automatskog odsustva u mirovanju"
+msgid "Always open a separate chat window for new chats."
+msgstr "Uvek otvara poseban prozor za nova ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Da li Pismonoša da sam uspostaviti vezu po pokretanju"
+msgid "Display incoming events in the status area"
+msgstr "Prikazuje dolazne događaje na liniji stanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Da li Pismonoša da umanji preciznost lokacije"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Prikazuje dolazne događaje na liniji stanja. Ako nije postavljeno, odmah ih "
+"prikazuje korisniku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje"
+msgid "The position for the chat window side pane"
+msgstr "Položaj bočne površi prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "Omogućava Veb kit razvojne alate"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Sačuvan položaj (u tačkama) bočne površi prozora za ćaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "Omogućava iskačuća obaveštenja za nove poruke"
+msgid "Show contact groups"
+msgstr "Prikazuje grupe kontakta"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "Omogućava proveru pisanja"
+msgid "Whether to show groups in the contact list."
+msgstr "Da li da prikazuje grupe u spisku kontakta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Sakriva glavni prozor"
+msgid "Contact list sort criterion"
+msgstr "Kriterijum za sortiranje prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Sakriva glavni prozor programa."
+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 ""
+"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
+"koristi „state“ (sortiranje po stanju prijatelja). Ako je vrednost „name“, "
+"sortiranje se vrši po imenu prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Znak za dovršavanje nadimka"
+msgid "Use notification sounds"
+msgstr "Koristi zvukove za obaveštenja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Otvara nova ćaskanja u različitim prozorima"
+msgid "Whether to play a sound to notify of events."
+msgstr "Da li da pusti obaveštajni zvuk za događaje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Putanja do Adijum teme za korišćenje"
+msgid "Disable sounds when away"
+msgstr "Onemogućava zvuke kada smo odsutni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "Pušta zvuk za dolazeće poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for new conversations"
-msgstr "Pušta zvuk za nove razgovore"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "Pušta zvuk za odlazeće poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs in"
-msgstr "Pušta zvuk kada se prijatelj prijavi"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when a contact logs out"
-msgstr "Pušta zvuk kada se prijatelj odjavi"
+msgid "Play a sound for new conversations"
+msgstr "Pušta zvuk za nove razgovore"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "Pušta zvuk kada se ja prijavim"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "Pušta zvuk kada se ja odjavim"
+msgid "Play a sound when a contact logs in"
+msgstr "Pušta zvuk kada se prijatelj prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ispisuje obaveštenja kada se prijatelj prijavi"
+msgid "Play a sound when a contact logs out"
+msgstr "Pušta zvuk kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ispisuje obaveštenja kada se prijatelj odjavi"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "Položaj prikaza kamerice za vreme poziva."
+msgid "Play a sound when we log in"
+msgstr "Pušta zvuk kada se ja prijavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Prikazuje gotovinu na spisku prijatelja"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Prikazuje slike"
+msgid "Play a sound when we log out"
+msgstr "Pušta zvuk kada se ja odjavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Prikazuje spisak prijatelja u sobama"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
+msgid "Enable popup notifications for new messages"
+msgstr "Omogućava iskačuća obaveštenja za nove poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Prikazuje prijatelje van mreže"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Da li da prikazuje oblačić obaveštenja kada primite novu poruku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Prikazuje protokole"
+msgid "Disable popup notifications when away"
+msgstr "Isključuje iskačuća obaveštenja kada smo odsutni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Jezici za proveru pisanja"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Da li da prikazuje oblačić obaveštenja kada ste zauzeti ili odsutni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Podrazumevana fascikla za čuvanje prenesenih datoteka."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ispisuje obaveštenja ako ćaskanje nije u fokusu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Poslednja fascikla iz koje je izabrana slika."
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Da li da prikazuje oblačić obaveštenja sa pristiglim porukama čak i kada je "
+"prozor za ćaskanje otvoren, ali nije u fokusu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "Položaj bočne površi prozora za ćaskanje"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ispisuje obaveštenja kada se prijatelj prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Sačuvan položaj (u tačkama) bočne površi prozora za ćaskanje."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Da li da prikazuje oblačić obaveštenja kada se prijatelj prijavi na mrežu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ispisuje obaveštenja kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Da li da prikazuje oblačić obaveštenja kada se prijatelj odjavi sa mreže."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "Prikazuje sličicu sa smeškom"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Koristi zvukove za obaveštenja"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Da li da prikazuje smeške kao sličice unutar razgovora."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Koristi teme za sobe ćaskanja"
+msgid "Show contact list in rooms"
+msgstr "Prikazuje spisak prijatelja u sobama"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+msgid "Chat window theme"
+msgstr "Tema prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tema za prikaz razgovora u prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
+msgid "Chat window theme variant"
+msgstr "Varijanta teme prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Da li Pismonoša da se sam prijavi na postojeće naloge nakon pokretanja."
+msgid "Path of the Adium theme to use"
+msgstr "Putanja do Adijum teme za korišćenje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr ""
-"Da li Pismonoša da automatski pređe u stanje odsustva prilikom mirovanja."
+"Putanja do Adijum teme za korišćenje, ako se koristi Adijum tema za ćaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti."
+msgid "Enable WebKit Developer Tools"
+msgstr "Omogućava Veb kit razvojne alate"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr ""
 "Da li će biti omogućeni Veb kit razvojni alati, kao što je Veb Inspektor."
 
-# Nije connect već disconnect!!! ~Miloš
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "Obaveštava ostale korisnike kada im pišete poruku"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
 msgstr ""
-"Da li treba koristiti upravnika mreže za automatsko prekidanje i ponovno "
-"uspostavljanje veze."
+"Da li će da pošalje stanja ćaskanja „sastavlja“ ili „pauziran“. Neće uticati na "
+"stanje „otišao“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Da li da proverava pisanje reči za izabrane jezike."
+msgid "Use theme for chat rooms"
+msgstr "Koristi teme za sobe ćaskanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Da li da prikazuje smeške kao sličice unutar razgovora."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Da li da koristi temu za sobe razgovora."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Da li će biti uključen filter Pulse audia za uklanjanje odjeka."
+msgid "Spell checking languages"
+msgstr "Jezici za proveru pisanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji prijave na mrežu."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. „sr, en, "
+"fr“)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Da li da pusti obaveštajni zvuk kada se prijatelji odjave sa mreže."
+msgid "Enable spell checker"
+msgstr "Omogućava proveru pisanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Da li da pusti obaveštajni zvuk za događaje."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Da li da proverava pisanje reči za izabrane jezike."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Da li da pusti obaveštajni zvuk kada vam stigne poruka."
+msgid "Nick completed character"
+msgstr "Znak za dovršavanje nadimka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Da li da pusti obaveštajni zvuk na novi razgovor."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak za dodavanje posle nadimka kada se koristi automatsko dovršavanje nadimka "
+"(tab) u grupnim ćaskanjima."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Da li da pusti obaveštajni zvuk kada pošaljete poruku."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Da li Pismonoša da koristi sliku prijatelja kao ikonicu prozora za ćaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Da li da pusti zvuk kada se prijavite na mrežu."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Da li Pismonoša da koristi sliku prijatelja kao ikonu u prozoru ćaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Da li da pusti zvuk kada se odjavite sa mreže."
+msgid "Last account selected in Join Room dialog"
+msgstr "Poslednji izabrani nalog u prozorčetu za pridruživanje sobi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Da li da pusti obaveštajni zvuk kada postanete zauzeti ili odsutni."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Putanja objekta D-basa poslednjeg naloga izabranog za pridruživanje sobi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Da li da prikazuje oblačić obaveštenja kada se prijatelj odjavi sa mreže."
+msgid "Camera device"
+msgstr "Uređaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr ""
-"Da li da prikazuje oblačić obaveštenja kada se prijatelj prijavi na mrežu."
+"Osnovna video kamerica koja će biti korišćena u video pozivima, npr. „/dev/"
+"video0“."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Da li da prikazuje oblačić obaveštenja sa pristiglim porukama čak i kada je "
-"prozor za ćaskanje otvoren, ali nije u fokusu."
+msgid "Camera position"
+msgstr "Položaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Da li da prikazuje oblačić obaveštenja kada primite novu poruku."
+msgid "Position the camera preview should be during a call."
+msgstr "Položaj prikaza kamerice za vreme poziva."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
+msgid "Echo cancellation support"
+msgstr "Podrška za uklanjanje odjeka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Da li će biti uključen filter Pulse audia za uklanjanje odjeka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
+msgid "Show hint about closing the main window"
+msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Da li da prikazuje oblačić obaveštenja kada ste zauzeti ili odsutni."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr ""
+"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
+"„x“ dugme."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru ćaskanja."
+msgid "Empathy can publish the user's location"
+msgstr "Da li Pismonoša sme da objavljuje lokaciju korisnika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Da li da prikazuje spisak prijatelja u sobama za ćaskanje."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Da li Pismonoša da objavljuje lokaciju korisnika njegovim prijateljima."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Da li da prikazuje spisak prijatelja u zbijenom režimu."
+msgid "Empathy can use the network to guess the location"
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
-"„x“ dugme."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mrežu da pogodi lokaciju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Da li da koristi temu za sobe razgovora."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Da li Pismonoša sme da koristi mobilnu mrežu da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Da li Pismonoša sme da koristi GPS da pogodi lokaciju."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Da li Pismonoša da umanji preciznost lokacije"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
 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."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
-"koristi „name“ (sortiranje po imenu prijatelja). Ako je vrednost „state“, "
-"sortiranje se vrši po stanju prijatelja."
+"Da li Pismonoša da umanji preciznost lokacije zbog povećane privatnosti."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Upravljajte nalozima za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c:738
+msgid "No reason was specified"
+msgstr "Nije naveden razlog"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Nalozi za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c:741
+msgid "The change in state was requested"
+msgstr "Zahtevana je promena stanja"
+
+#: ../libempathy/empathy-ft-handler.c:744
+msgid "You canceled the file transfer"
+msgstr "Obustavili ste prenos datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:747
+msgid "The other participant canceled the file transfer"
+msgstr "Druga strana je prekinula prenos datoteke"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:750
+msgid "Error while trying to transfer the file"
+msgstr "Greška prilikom prenosa datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:753
+msgid "The other participant is unable to transfer the file"
+msgstr "Druga strana nije u mogućnosti da prenese datoteku"
+
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nepoznat razlog"
+
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je završen, ali je datoteka oštećena"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Druga strana ne podržava prenos datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Izabrana datoteka nije obična datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Izabrana datoteka je prazna"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Propušten poziv od %s"
@@ -548,169 +602,138 @@ msgstr "Poziv korisnika %s"
 msgid "Call from %s"
 msgstr "Poziv od %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Vrsta priključka nije podržana"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nije naveden razlog"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Zahtevana je promena stanja"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Obustavili ste prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Druga strana je prekinula prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "Greška prilikom prenosa datoteke"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strana nije u mogućnosti da prenese datoteku"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezan"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nije naveden razlog"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na „nepovezan“"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Greška u mreži"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Neuspešna prijava"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Greška pri šifrovanju"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ime je u upotrebi"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Sertifikat nije prosleđen"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Sertifikat nije od poverenja"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikat je istekao"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikat nije aktiviran"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Ime domaćina sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisak sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Sertifikat je samopotpisan"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Greška u sertifikatu"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Šifrovanje nije dostupno"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikat nije ispravan"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Veza je odbijena"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Veza ne može da se uspostavi"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Veza je izgubljena"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ovaj resurs je već povezan sa serverom"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Ovaj nalog je već povezan sa serverom"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Veza je zamenjena novom vezom koristeći isti resurs"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je trenutno previše zauzet da bi uspostavio vezu"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikat je opozvan"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat koristi nebezbedni algoritam šifrovanja ili je kriptografski slab"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -718,42 +741,49 @@ msgstr ""
 "Dužina sertifikata servera, ili dubina lanca sertifikata servera premašuje "
 "granice biblioteke za šifrovanje"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "Vaš softver je previše star"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Unutrašnja greška"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Ljudi u okolini"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Jahu! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Gugl razgovor"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Fejsbuk ćaskanje"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "Pre %d sekunde"
+msgstr[0] "Pre %d sekund"
 msgstr[1] "Pre %d sekunde"
 msgstr[2] "Pre %d sekundi"
 msgstr[3] "Pre jedne sekunde"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
-msgstr[0] "Pre %d minuta"
+msgstr[0] "Pre %d minut"
 msgstr[1] "Pre %d minuta"
 msgstr[2] "Pre %d minuta"
 msgstr[3] "Pre jednog minuta"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +792,7 @@ msgstr[1] "Pre %d sata"
 msgstr[2] "Pre %d sati"
 msgstr[3] "Pre jednog sata"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -771,7 +801,7 @@ msgstr[1] "Pre %d dana"
 msgstr[2] "Pre %d dana"
 msgstr[3] "Pre jednog dana"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -780,7 +810,7 @@ msgstr[1] "Pre %d nedelje"
 msgstr[2] "Pre %d nedelja"
 msgstr[3] "Pre jedne nedelje"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -789,224 +819,211 @@ msgstr[1] "Pre %d meseca"
 msgstr[2] "Pre %d meseci"
 msgstr[3] "Pre jednog meseca"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "u budućnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "Lozinka nije pronađena"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "Lozinka TP naloga za %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "Lozinka za pričaonicu „%s“ na nalogu %s (%s)"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Svi nalozi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "Moji veb nalozi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Nalog %s je izmenjen putem %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Pokreni Moje veb naloge"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Izmeni %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Primeni"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Prijavi _me"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ovaj nalog već postoji na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Napravi novi nalog na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "Po_ništi"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %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:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Novi nalog"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Primer:</b> MojNadimak"
+#: ../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:"
+msgstr "_Lozinka:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Screen _Name:"
+msgstr "_Nadimak:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> MojNadimak"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Lozinka:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapamti lozinku"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Zapamti lozinku"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nadimak:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Koja je vaša AIM lozinka?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Koji je vaš AIM nadimak?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Koja je vaša AIM lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> korisničko_ime"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_Korisničko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> korisničko_ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Koji je vaš Group Vajz korisnički IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Koja je vaša Group Vajz lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICKu _KIB:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Kodni r_aspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICKu _KIB:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Koji je vaš ICKu KIB?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Koja je vaša ICKu lozinka?"
 
@@ -1043,11 +1060,23 @@ msgstr "Opcije"
 msgid "None"
 msgstr "Ništa"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Mreža"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Mreža:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Kodni raspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serveri"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1055,14 +1084,6 @@ msgstr ""
 "Većina IRC servera ne traži lozinku, zato ako niste sigurni, nemojte je "
 "unositi."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Mreža"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Mreža:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nadimak:"
@@ -1079,48 +1100,20 @@ msgstr "Poruka za kraj:"
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serveri"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Koji je vaš IRC nadimak?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Koja IRC mreža?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Primer:</b> korisnik@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Primer:</b> korisnik@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Zahteva se _šifrovanje(TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Zanemari greške SSL sertifikata"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Prevaziđi postavke servera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Prioritet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Koji je vaš IRC nadimak?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Resurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Koje je vaše Fejsbuk korisničko ime?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1132,179 +1125,203 @@ msgstr ""
 "Ukoliko nemate korisničko ime za Fejsbuk, idite na <a href=\"http://www."
 "facebook.com/username/\">ovu stranu</a> da ga izaberete."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Koristi stari SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Koja je vaša Fejsbuk lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Koje je vaše Fejsbuk korisničko ime?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Koji je vaš Gugl IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Primer:</b> korisnik@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Koja je vaša Gugl lozinka?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Primer:</b> korisnik@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Zanemari greške SSL sertifikata"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Prioritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Zahteva se _šifrovanje(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Koristi stari SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Prevaziđi postavke servera"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Koji je vaš Džaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Koja je vaša Džaber lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Koji je vaš željeni Džaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Koja je vaša Džaber lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Koja ja vaša željena Džaber lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Primer:</b> korisnik@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Koji je vaš Vindouz Uživo IB ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Koja je vaša Vindouz Uživo lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Adresa _e-pošte:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Prezime:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ime:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Ime za _objavu:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Džaber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Prezime:"
+msgid "E-_mail address:"
+msgstr "Adresa _e-pošte:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Ime za _objavu:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Korisničko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Primer:</b> korisnik@moj.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Korisničko ime za prijavu:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Otkrij povezivanja"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Automatski otkrij STUN server"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Zanemari TLS greške"
+msgid "NAT Traversal Options"
+msgstr "Opcije prolaska kroz NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Period (u sekundama)"
+msgid "Proxy Options"
+msgstr "Opcije posrednika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcije za održavanje stalne veze"
+msgid "Miscellaneous Options"
+msgstr "Razne opcije"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Slabo rutiranje"
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehanizam:"
+msgid "Discover the STUN server automatically"
+msgstr "Automatski otkrij STUN server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Razne opcije"
+msgid "Discover Binding"
+msgstr "Otkrij povezivanja"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcije prolaska kroz NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcije za održavanje stalne veze"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mehanizam:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcije posrednika"
+msgid "Interval (seconds)"
+msgstr "Period (u sekundama)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Korisničko ime za prijavu:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Loose Routing"
+msgstr "Slabo rutiranje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Zanemari TLS greške"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Koja je lozinka za vaš SIP nalog?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Koja je identifikacija za SIP prijavu?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Korisničko ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Koja je lozinka za vaš SIP nalog?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Jahu! I_B:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Zanemari pozivnice za pričaonice i konferencije"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lok_alni spisak soba:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Koji je vaš Jahu! IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Koja je vaša Jahu! lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Jahu! I_B:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lok_alni spisak soba:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1342,84 +1359,88 @@ msgstr "Sve datoteke"
 msgid "Click to enlarge"
 msgstr "Kliknite da uvećate"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Došlo je do greške prilikom pozivanja"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Navedeni kontakt ne podržava pozive"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Navedeni kontakt nije na vezi"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Navedeni kontakt nije ispravan"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Ovaj protokol ne podržava hitne pozive"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "Nemate dovoljno kredita da biste mogli da obavite ovaj poziv"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Nisam uspeo da otvorim privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Teme nisu podržane u ovom razgovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "Nije vam dozvoljeno da promenite temu"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "„%s“ nije ispravan IB kontakta"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: čisti sve poruke iz ovog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <IB sobe>: priključuje se novoj sobi za ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <IB sobe>: priključuje se novoj sobi za ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<IB sobe>] [<razlog>]: napušta sobu za ćaskanje, podrazumevano trenutnu"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <IB prijatelja> <poruka>: otvara privatno ćaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nadimak>: menja vaš nadimak na trenutnom serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <poruka>: šalje poruku RADNJA na trenutni razgovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1429,11 +1450,11 @@ msgstr ""
 "poruka koje počinju sa „/“. Na primer: „/say /join se koristi za priključivanje "
 "u novu sobu za ćaskanje“"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <IB kontakta>: prikazuje podatke o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1462,126 @@ msgstr ""
 "/help [<komanda>]: prikazuje sve podržane naredbe. Ako se da i konkretna "
 "<naredba>, prikazuje njeno uputstvo za upotrebu."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Korišćenje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Nepoznata naredba"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nepoznata naredba; pogledajte /help za dostupne naredbe"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "nema dovoljno gotovine za slanje poruke"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "Greška pri slanju poruke „%s“: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "Greška pri slanju poruke: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "nema dovoljno gotovine za slanje poruke. <a href='%s'>Dopunite</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "nesposoban"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "poruka je preduga"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "nije podržano"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "Greška pri slanju poruke „%s“: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "Greška pri slanju poruke: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Temu je postavio %s na: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(nema predloga)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj „%s“ u rečnik"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj „%s“ u rečnik za %s jezik"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Ubaci smešak"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Pošalji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Nisam uspeo da preuzmem skorašnje dnevnike"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je otišao sa veze"
@@ -1555,12 +1589,12 @@ msgstr "%s je otišao sa veze"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izbacio korisnika %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je izbačen"
@@ -1568,17 +1602,17 @@ msgstr "%s je izbačen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je zabranio pristup korisniku %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "Korisniku %s je zabranjen pristup"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) pričaonicu"
@@ -1588,17 +1622,17 @@ msgstr "%s je napustio(la) pričaonicu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je pristupio(la) pričaonici"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"
@@ -1606,90 +1640,90 @@ msgstr "%s je sada poznat kao %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:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Da li želite da zapamtite ovu lozinku?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Pokušaj ponovo"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Pogrešna lozinka, pokušajte ponovo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Ova soba je zaštićena lozinkom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Priključi se"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Razgovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Nepoznati ili neispravan identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokiranje prijatelja je trenutno nedostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokiranje prijatelja nije dostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Ne mogu da blokiram prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Izmeni blokirane prijatelje"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Nalog:"
 
@@ -1699,63 +1733,54 @@ msgstr "Blokirani prijatelji"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Ukloni"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "_Umnoži adresu veze"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "_Otvori vezu"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Izmeni podatke kontakta"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Podaci o profilu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Novi prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blokirati %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 ""
 "Da li ste sigurni da želite da blokirate da vas „%s“ više ne kontaktira?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "P_rijavi ovaj kontakt za zloupotrebu"
@@ -1764,401 +1789,315 @@ msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
 msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Od_luči kasnije"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Zahtev za pretplatu"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blokiraj korisnika"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupisano"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Omiljeni ljudi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Uklanjam grupu"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Uklanjam prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "Dod_aj prijatelja…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokiraj kontakt"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Ća_skanje"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio poziv"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video poziv"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Prethodni razgovori"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "Pošalji datoteku"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Podeli moju radnu površ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Omiljeni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Podaci"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Izm_eni"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Pozivam vas u ovu sobu"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Pozov_i u sobu za ćaskanje"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Od_luči kasnije"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "Pretraži kontakte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Pretraga:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Dod_aj prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nije pronađen nijedan prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Poruka koja vas predstavlja:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Molim vas obavestite ne kada ste na mreži. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Izaberite prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Puno ime:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Broj telefona:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Adresa e-pošte:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Veb stranica:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "Rođendan:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "Viđen pre:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Povezan sa:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poruka za odsutnost:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO kod države:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Država:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Republika:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Grad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Poštanski kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Zgrada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Sprat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Adresa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivo tačnosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Greška:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Uspravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vodoravna greška (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Pravac:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Brzina penjanja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Poslednji put ažurirano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Geografska dužina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Geografska širina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Visina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Lokacija"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y u %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Sačuvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ne mogu da sačuvam sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Lokacija</b> u (datum)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nadimak:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Podaci o klijentu"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Program:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Lični podaci"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalji o prijatelju"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "Ime i prezime"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "Broj telefona"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "Adresa el. pošte"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "Veb stranica"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "Rođendan"
+
+#. 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 "Viđen pre:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Povezan sa:"
+
+#. 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 "Poruka za odsutnost:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "posao"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "kuća"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "mobilni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "glasovni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "prvenstveni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "poštanski"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "pošiljka"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Nadimak:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Lokacija</b> u (datum)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "Zahtevani su podaci…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Podaci o klijentu"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Izdanje:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Program:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +2105,21 @@ msgstr ""
 "Izaberite grupe u kojima želite da se prijatelj nalazi.  Primetite da možete "
 "da odaberete i više grupa kao i nijednu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Dod_aj grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Sledeći identitet će biti blokiran:"
@@ -2188,7 +2127,7 @@ msgstr[1] "Sledeći identiteti će biti blokirani:"
 msgstr[2] "Sledeći identiteti će biti blokirani:"
 msgstr[3] "Sledeći identitet će biti blokiran:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Sledeći identitet ne može biti blokiran:"
@@ -2196,79 +2135,144 @@ msgstr[1] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[2] "Sledeći identiteti ne mogu biti blokirani:"
 msgstr[3] "Sledeći identitet ne može biti blokiran:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Povezani prijatelji"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Izaberite prijatelja za povezivanje"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Pregled novog prijatelja"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Označeni prijatelji na spisku levo će biti uvezani zajedno."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Izmeni podatke kontakta"
 
 #. 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:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Izaberite nalog koji će biti korišćen za poziv"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Posao"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "KUĆA"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokiraj kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "Ća_skanje"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Prethodni razgovori"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Pošalji datoteku"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Podeli moju radnu površ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Omiljeni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "program gnomovi kontakti nije instaliran"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalirajte „gnome-contacts“ da pristupite podacima kontakata."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "_Podaci"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Poveži kontakte…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Pozivam vas u ovu sobu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "Pozov_i u sobu za ćaskanje"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "Dod_aj prijatelja…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
 msgid "Delete and _Block"
 msgstr "Izbriši i _blokiraj"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Da li ste sigurni da želite da uklonite grupu „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "Uklanjam grupu"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Da li ste sigurni da želite da uklonite prijatelja „%s“?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2277,7 +2281,11 @@ msgstr ""
 "Da li stvarno želite da uklonite uvezani kontakt „%s“? Ovo će ukloniti i sve "
 "kontakte koji su vezani za ovaj kontakt."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "Uklanjam prijatelja"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2290,23 +2298,23 @@ msgstr[3] "Uvezani prijatelj sadrži jedan kontakt"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Lokacija</b> u (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Na vezi preko telefona ili mobilnog uređaja"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova mreža"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Odaberite IRC mrežu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Resetuj _mrežni spisak"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Izaberi"
@@ -2319,91 +2327,48 @@ msgstr "novi server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Poveži prijatelje"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Razveži…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Uveži"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Da razvežem uvezanog prijatelja „%s“?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete "
-"razdvojiti uvezane kontakte u posebne prijatelje."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Razveži"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Istorijat"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Prikaži"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Potraži"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Ćaskanje u %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Ćaskanje sa %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2412,7 +2377,7 @@ msgstr[1] "%s sekunde"
 msgstr[2] "%s sekundi"
 msgstr[3] "jedne sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2421,151 +2386,197 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuta"
 msgstr[3] "jednog minuta"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Poziv je započet %s, a završen je %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Danas"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Juče"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Bilo kad"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Bilo ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Bilo šta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Pisana ćaskanja"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Dolazni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Odlazeći pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Propušteni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Šta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Da li ste sigurni da želite da obrišete sve dnevnike prethodnih razgovora?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Očisti sve"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Obriši od:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Učitavam...</span>"
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Ćaskanje"
+#: ../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 "Izm_eni"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Obriši sav istorijat..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Ćaskanje"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Izm_eni"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "strana 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "IB prijatelja:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Učitavam...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ć_askaj"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "Kontakt nije na vezi"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "Navedeni kontakt ili je neispravan ili nepoznat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakt ne podržava ovu vrstu razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Zahtevana funkcionalnost nije primenjena za ovaj protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ne mogu da započnem razgovor sa datim kontaktom"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "Izbačeni ste sa ovog kanala"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Ovaj kanal je pun"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "Morate biti pozvani da se pridružite ovom kanalu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "Ne mogu da nastavim dok je veza prekinuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "Došlo je do greške prilikom započinjanja razgovora"
+
+#: ../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 "Unesite odrednik kontakta ili telefonski broj:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Novi razgovor"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "Pošalji _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_Video poziv"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Pozovi"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_Audio poziv"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Novi poziv"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Nije uspelo potvrđivanje identiteta za nalog <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"
@@ -2602,12 +2613,8 @@ msgstr "Kliknite da postavite ovu poruku stanja kao omiljenu"
 msgid "Set status"
 msgstr "Postavi stanje"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Postavite vaše prisustvo i trenutno stanje"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "Proizvoljne poruke…"
 
@@ -2615,7 +2622,7 @@ msgstr "Proizvoljne poruke…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Novi %s nalog"
@@ -2625,20 +2632,20 @@ msgid "Find:"
 msgstr "Traži:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Uporedi veličinu slova"
+msgid "_Previous"
+msgstr "_Prethodno"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Izraz nije pronađen"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Sledeće"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Uporedi veličinu slova"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Prethodno"
+msgid "Phrase not found"
+msgstr "Izraz nije pronađen"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,12 +2691,12 @@ msgstr "Poziv za razgovor je završen"
 msgid "Edit Custom Messages"
 msgstr "Uredi proizvoljne poruke"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Poruka je uređena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normalno"
 
@@ -2766,34 +2773,38 @@ msgid "Certificate hostname: %s"
 msgstr "Ime domaćina sertifikata: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Nastavi"
+msgid "C_ontinue"
+msgstr "_Nastavi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepoverljiva veza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ova veza nije od poverenja. Želite li ipak da nastavite?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapamti ovaj izbor za naredne veze"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalji sertifikata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Ne mogu da otvorim adresu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Nema dovoljno slobodnog mesta za čuvanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,7 +2813,7 @@ msgstr ""
 "Potrebno je %s za snimanje ove datoteke, ali je dostupno samo %s. Odaberite "
 "drugo mesto za snimanje."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Dolazeća datoteka od %s"
@@ -2974,40 +2985,32 @@ msgstr "zapadni"
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Izabrani prijatelj ne može da primi datoteke."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Izabrani prijatelj nije na vezi."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nema poruka o greškama"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Brza poruka (Pismonoša)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Ne povezuj se po pokretanju"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ne prikazuj spisak prijatelja niti bilo koje drugo prozorče po pokretanju"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— Internet pismonoša za brze poruke"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Greška pri komunikaciji sa Upravnikom naloga"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3055,11 +3058,11 @@ msgstr ""
 "adresu: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomov program za brze poruke"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Danilo Šegan <dsegan@gmx.net>\n"
@@ -3071,222 +3074,83 @@ msgstr ""
 "\n"
 "Prevod.org — prevod na srpski jezik."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Greška pri uvoženju naloga."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Greška pri obradi detalja naloga."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Greška pri pravljenju naloga."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Dogodila se greška."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Ispisana poruka greške: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
-"zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "Došlo je do greške"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Koji tip naloga za ćaskanje imate?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Unesite detalje naloga"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Koji tip naloga za ćaskanje želite da napravite?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Da li želite da napravite još naloga za ćaskanje?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Unesite detalje novog naloga"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa prijateljima "
-"i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i mnoge druge "
-"programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da obavljate i "
-"audio i video pozive."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
-"Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "Da, uvezi detalje mog naloga iz "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "Da, ja ću sam uneti detalje naloga"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "Ne, želim novi nalog"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ne, za sada samo želim da vidim ljude u blizini"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "Izaberite naloge koje želite da uvezete:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "Da"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "Ne, to je sve za sada"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
-"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
-"su detalji ispod tačni. Lako ih možete izmeniti kasnije ili isključiti ovu "
-"mogućnost iz prozorčeta „Nalozi“."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "Izmeni->Nalozi"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "Za sada _ne želim da koristim ovu mogućnost"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
-"salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
-"telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozorčeta „Nalozi“."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut nije instaliran"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Asistent naloga za brze poruke i VoIP"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Dobrodošli u Internet Pismonošu"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "Uvezite vaše postojeće naloge"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "Unesite lične podatke"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Postoje nesačuvane izmene na vašem nalogu %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Vaš novi nalog još nije sačuvan."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "Povezujem se…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Nepovezan — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Veza je prekinuta — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Nepovezan — Nema mrežne konekcije"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Nepoznato stanje"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Ovaj nalog je isključen zato što se zasniva na starom, nepodržanom pozadincu. "
+"Instalirajte „telepathy-haze“ i ponovo pokrenite vašu sesiju da premestite "
+"nalog."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Nepovezan — Nalog je onemogućen"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
-"Da li sigurno želite da nastavite?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Uredite parametre povezivanja"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Nisam uspeo da dovučem vaše lične podatke sa servera."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Uspostavite vezu da uredite vaše lične podatke."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Uredi parametre povezivanja..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Da li ste sigurni da želite da uklonite „%s“ sa vašeg računara?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Ovo neće ukloniti vaš nalog na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3159,23 @@ msgstr ""
 "Da li sigurno želite da nastavite?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "O_nemogući"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Preskoči"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_Poveži se"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3187,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Dodaj…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Učitavam podatke o nalogu"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nijedan protokol nije instaliran"
+msgid "_Import…"
+msgstr "_Uvezi…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokol:"
+msgid "Loading account information"
+msgstr "Učitavam podatke o nalogu"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,148 +3203,132 @@ msgstr ""
 "Da dodate novi nalog, prvo morate da instalirate priključke za sve protokole "
 "koje želite da koristite."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Uvezi…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Nisu instalirani pozadinci protokola"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — Internet pismonoša klijent prijave"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Internet pismonoša klijent prijave"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Ljudi u okolini"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "— Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Internet pismonoša Audio/Video klijent"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Osvetljenost"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Jačina zvuka"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Bočna površ"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Zvučni ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Video ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Brojčanik"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Detalji"
 
 #. 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:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Poziv sa korisnikom %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "IP adresa kako je vidi ovaj računar"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adresa kako je vidi server na internetu"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adresa vršnjaka kako je vidi druga strana"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "IP adresa relejnog servera"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "IP adresa grupe za višestruko emitovanje"
 
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
 #: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
 #: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "Povezan — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Tehnički detalji"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan zvučni format koji podržava vaš računar"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan video format koji podržava vaš računar"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3337,27 @@ msgstr ""
 "Ne mogu da uspostavim vezu sa %s. Možda je neko od vas dvoje na mreži koja "
 "ne dozvoljava direktne veze."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Došlo je do greške u mreži"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Zvučni formati potrebni za ovaj poziv nisu instalirani na vašem računaru"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Video formati potrebni za ovaj poziv nisu instalirani na vašem računaru"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3368,216 @@ msgstr ""
 "\">ovu grešku</a> i prikačite dnevnike pokupljene iz prozora „Otklanjanje "
 "grešaka“ u meniju „Pomoć“."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Došlo je do greške u motoru za pozive"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Dostignut je kraj toka"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Ne mogu da uspostavim zvučni tok"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Ne mogu da uspostavim video tok"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Pozovi"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek za dekodiranje:"
+msgid "_Microphone"
+msgstr "Mi_krofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Isključite kamericu"
+msgid "_Camera"
+msgstr "_Kamerica"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Prikažite brojčanik"
+msgid "_Settings"
+msgstr "Po_dešavanja"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek za kodiranje:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "Pre_gled"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Prekini"
+#: ../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 "Po_moć"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Prekinite trenutni poziv"
+#: ../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 "_Sadržaj"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalni kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Otklanjanje _grešaka"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Uvećaj me"
+msgid "Swap camera"
+msgstr "Razmeni kameru"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Umanji me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Udaljeni kandidat:"
+msgid "Maximise me"
+msgstr "Uvećaj me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Pošalji zvuk"
+msgid "Disable camera"
+msgstr "Isključite kamericu"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Pošalji video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Prekini"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Prikaži brojčanik"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Prekinite trenutni poziv"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video poziv"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Započnite video poziv"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Započnite audio poziv"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Razmeni kameru"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Uključi/isključi prenos zvuka"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Uključi/isključi prenos videa"
+msgid "Show dialpad"
+msgstr "Prikaži brojčanik"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nepoznato"
+msgid "Display the dialpad"
+msgstr "Prikažite brojčanik"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Pošalji video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video poziv"
+msgid "Toggle video transmission"
+msgstr "Uključi/isključi prenos videa"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Pozovi"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Pošalji zvuk"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamerica"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Sadržaj"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Uključi/isključi prenos zvuka"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Otklanjanje _grešaka"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodek za kodiranje:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Po_moć"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek za dekodiranje:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Mi_krofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Udaljeni kandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Po_dešavanja"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokalni kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Pre_gled"
+msgid "Audio"
+msgstr "Audio"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Da zatvorim ovaj prozor?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Zatvaranjem ovog prozora biće napušteno %s. Nećete primati nikakve buduće "
+"poruke sve dok se ponovo ne pridružite."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Zatvaranjem ovog prozora biće napuštena %u soba za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+msgstr[1] ""
+"Zatvaranjem ovog prozora biće napuštene %u sobe za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+msgstr[2] ""
+"Zatvaranjem ovog prozora biće napušteno %u soba za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+msgstr[3] ""
+"Zatvaranjem ovog prozora biće napuštena jedna soba za ćaskanje. Nećete primati "
+"nikakve buduće poruke sve dok se ponovo ne pridružite."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Da napustim %s?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"Nećete primati nikakve buduće poruke iz ove sobe za ćaskanje sve dok joj se "
+"ponovo ne pridružite."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Zatvori prozor"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Napusti sobu"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3679,7 +3586,7 @@ msgstr[1] "%s (%d nepročitane)"
 msgstr[2] "%s (%d nepročitanih)"
 msgstr[3] "%s (jedna nepročitana)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3688,7 +3595,7 @@ msgstr[1] "%s (i %u druge)"
 msgstr[2] "%s (i %u drugih)"
 msgstr[3] "%s (i jedna druga)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3697,7 +3604,7 @@ msgstr[1] "%s (%d nepročitane od ostalih)"
 msgstr[2] "%s (%d nepročitanih od ostalih)"
 msgstr[3] "%s (jedna nepročitana od ostalih)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3706,11 +3613,11 @@ msgstr[1] "%s (%d nepročitane od svih)"
 msgstr[2] "%s (%d nepročitanih od svih)"
 msgstr[3] "%s (jedna nepročitana od svih)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3719,69 +3626,69 @@ msgstr[1] "Šaljem %d poruke."
 msgstr[2] "Šaljem %d poruka."
 msgstr[3] "Šaljem jednu poruku"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Piše poruku."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_Očisti"
+msgid "_Conversation"
+msgstr "_Razgovor"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Prijatelj"
+msgid "C_lear"
+msgstr "_Očisti"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ubaci _smešak"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Omiljena soba za _ćaskanje"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Pozovi _učesnike…"
+msgid "Notify for All Messages"
+msgstr "Obavesti za sve poruke"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Premesti jezičak _levo"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Prikaži _spisak prijatelja"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Premesti jezičak _desno"
+msgid "Invite _Participant…"
+msgstr "Pozovi _učesnike…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Obavesti za sve poruke"
+msgid "C_ontact"
+msgstr "_Prijatelj"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Razgovor"
+msgid "_Tabs"
+msgstr "_Listovi"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Otkači list"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Omiljena soba za _ćaskanje"
+msgid "_Previous Tab"
+msgstr "_Prethodni list"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Sledeći list"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Prethodni list"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Opozovi zatvaranje jezička"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Prikaži _spisak prijatelja"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Premesti jezičak _levo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Listovi"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Premesti jezičak _desno"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Opozovi zatvaranje jezička"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Otkači list"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3795,100 +3702,100 @@ msgstr "Soba"
 msgid "Auto-Connect"
 msgstr "Automatsko povezivanje"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Uredi omiljene sobe"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Dolazni video poziv"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas zove video pozivom. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas zove. Želite li da se javite?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../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 "Dolazni poziv od %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "_Odbaci"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Javi se"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "Odgovori sa _videom"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../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 "Dolazni video poziv od %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Pozivnice za sobu"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozivnica da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Priključi se"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas poziva da se pridružite %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Pozvani ste da se pridružite u %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Dolazni prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Zahtevana je lozinka"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s traži odobrenje da vidi kada ste na vezi"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3898,105 +3805,105 @@ msgstr ""
 "Poruka: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Primam „%s“ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Šaljem „%s“ za %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "Greška pri primanju „%s“ od %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "Greška pri primanju datoteke"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "Greška pri slanju „%s“ za %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "Greška pri slanju datoteke"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "„%s“ je primljen od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " „%s“ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Prenos datoteke je završen"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Čekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Proveravam integritet datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Tražim heš datoteke „%s“"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -4008,7 +3915,11 @@ msgstr "Prenosi datoteka"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ukloni završene, otkazane i neuspešne prenose datoteka sa spiska"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Uvezi"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4016,171 +3927,198 @@ msgstr ""
 "Nisam pronašao nijedan nalog za uvoz. Internet pismonoša trenutno podržava "
 "samo uvoženje naloga iz Pidžina."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Uvezite naloge"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Uvezi"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Unesite lozinku"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Veza je prekinuta"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Morate da podesite nalog da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Nema poklapanja"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+"Izvinite, %s nalozi ne mogu biti korišćeni sve dok ne ažurirate vaš %s "
+"softver."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "Ažuriraj softver..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Ponovo se poveži"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Izmeni nalog"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Zatvori"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Dopuni %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Dopunite kredit naloga"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Dopuni..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Prijatelj"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+"Morate da uključite jedan od vaših naloga da biste ovde videli kontakte."
+
+#. 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 "Morate da uključite %s da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Prijatelji na _mapi"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Podešavanja naloga"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Iznos gotovine"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Novi razgovor…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Pronađi u _spisku prijatelja"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Novi _poziv…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Pridruži se _omiljenim"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Traži prijatelje…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Uredi omiljene"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Prenosi _datoteka"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormalna veličina"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Nep_ovezani prijatelji"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Novi _poziv…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Prikaži _protokole"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normalna veličina sa _avatarima"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Iznos gotovine"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Prijatelji na _mapi"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "N_alozi"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blokirani prijatelji"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Postavke"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Prikaži _protokole"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Pronađi u _spisku prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Poređaj prema _imenu"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Poređaj prema _stanju"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "N_alozi"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normalna veličina sa _avatarima"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokirani prijatelji"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormalna veličina"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompaktna veličina"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Prenosi _datoteka"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Soba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Priključi se…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Novi razgovor…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nep_ovezani prijatelji"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "Lični _podaci"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Soba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Pridruži se _omiljenim"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Traži prijatelje…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Uredi omiljene"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Soba za ćaskanje"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Članovi"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4131,27 @@ msgstr ""
 "Potrebna lozinka: %s\n"
 "Članovi: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Da"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ne mogu da pokrenem listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ne mogu da zaustavim listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ne mogu da učitam spisak soba"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Pridruži se sobi"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4160,10 @@ msgstr ""
 "Ovde unesite ime sobe za pridruživanje ili kliknite na neku od soba na spisku."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Soba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4224,505 +4171,829 @@ msgstr ""
 "Unesite server koji ugošćava sobe, ili ostavite prazno ako su sobe na "
 "serveru na kojem vam je nalog"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Pridruži se sobi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ne mogu da učitam spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Soba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Paja"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Jare"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Jao, kume, gotov sam!! Ja sam bivši čovek!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Pajo, šta je bilo, Pajooo??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Kako šta je bilo?? Nema je više, ukrali su mi je!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Šta su ti ukrali, Pajo?? Štaaaa??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Kako šta?? Ama lađu, ukrali su mi lađu!! Jao meni!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Sav očajan, Paja je prekinuo vezu."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Postavke"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Prikaži slike _smešaka"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Prikaži spisak _prijatelja u sobama"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Izgled"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Ponašanje"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Započni ćaskanja u:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema ćaskanja:"
+msgid "new ta_bs"
+msgstr "novim _jezičcima"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Isključi obaveštenja kada sam _odsutan ili zauzet"
+msgid "new _windows"
+msgstr "novim _prozorima"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Isključi zvuke kada sam _odsutan ili zauzet"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Prikaži dolazne događaje u obaveštajnoj zoni"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Sam se poveži nakon pokretanja"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Uklanjanje odjeka čini da vaš glas drugoj osobi zvuči jasnije, ali može da "
-"izazove probleme na nekim računarima. Ako vi ili vaš sagovornik čujete čudne "
-"šumove ili krčanje za vreme poziva, pokušajte da isključite uklanjanje odjeka i "
-"ponovo pokrenite poziv."
+msgid "Log conversations"
+msgstr "Zabeleži razgovore"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
+msgid "Behavior"
+msgstr "Ponašanje"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+msgid "General"
+msgstr "Opšte"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
+msgid "_Enable bubble notifications"
+msgstr "_Omogući obaveštenja u oblačićima"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Omogući proveru pravopisa za sledeće jezike:"
+msgid "Disable notifications when _away or busy"
+msgstr "Isključi obaveštenja kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Opšte"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Omogući obaveštenja kada _ćaskanja nisu u fokusu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ulazni nivo:"
+msgid "Enable notifications when a contact comes online"
+msgstr "Omogući obaveštenja kada prijatelj dođe na mrežu"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "Jačina ulaznog zvuka:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Omogući obaveštenja kada prijatelj ode sa mreže"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "Obaveštenja"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Izvori lokacija:"
+msgid "_Enable sound notifications"
+msgstr "Omogući _zvučna obaveštenja"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "Zabeleži razgovore"
+msgid "Disable sounds when _away or busy"
+msgstr "Isključi zvuke kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "Obaveštenja"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Pusti zvuk za događaje"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Zvuci"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privatnost"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Koristi uklanjanje _odjeka da poboljšaš kvalitet poziva"
 
 #: ../src/empathy-preferences.ui.h:23
 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."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Umanjena tačnost lokacije znači da će najtačniji objavljeni podaci o vašoj "
-"lokaciji biti grad i država.  GPS koordinate će biti tačne do 1. decimale."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "Prikaži slike _smešaka"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "Prikaži spisak _prijatelja u sobama"
+"Uklanjanje odjeka čini da vaš glas drugoj osobi zvuči jasnije, ali može da "
+"izazove probleme na nekim računarima. Ako vi ili vaš sagovornik čujete čudne "
+"šumove ili krčanje za vreme poziva, pokušajte da isključite uklanjanje odjeka i "
+"ponovo pokrenite poziv."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Zvuci"
+msgid "_Publish location to my contacts"
+msgstr "Objavi lokaciju mojim _prijateljima"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Provera pisanja"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 ""
-"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
-"rečnike."
+"Umanjena tačnost lokacije znači da će najtačniji objavljeni podaci o vašoj "
+"lokaciji biti grad i država.  GPS koordinate će biti tačne do 1. decimale."
 
+#. 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 "Themes"
-msgstr "Teme"
+msgid "_Reduce location accuracy"
+msgstr "Umanji _tačnost lokacije"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Varijanta:"
+msgid "Privacy"
+msgstr "Privatnost"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Sam se poveži nakon pokretanja"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_Omogući obaveštenja u oblačićima"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_Mreža (IP, bežična)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "Omogući _zvučna obaveštenja"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Izvori lokacija:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_Mreža (IP, bežična)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
+"rečnike."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Otvaraj ćaskanja u novim prozorima"
+msgid "Enable spell checking for languages:"
+msgstr "Omogući proveru pravopisa za sledeće jezike:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Objavi lokaciju mojim _prijateljima"
+msgid "Spell Checking"
+msgstr "Provera pisanja"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Tema ćaskanja:"
 
-#. 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:40
-msgid "_Reduce location accuracy"
-msgstr "Umanji _tačnost lokacije"
+msgid "Variant:"
+msgstr "Varijanta:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teme"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Pozovi prijatelja ponovo"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Isklj. kameru"
+msgid "Redial"
+msgstr "Ponovo zovi"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Uklj. kameru"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Isklj. video"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Onemogući kameru i prestani da šalješ video"
+msgid "Video Preview"
+msgstr "Pregled videa"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Omogući kameru i šalji video"
+msgid "Video On"
+msgstr "Uklj. video"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Omogući kameru, ali ne šalji video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Pregled"
+msgid "Camera Off"
+msgstr "Isklj. kameru"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovo zovi"
+msgid "Disable camera and stop sending video"
+msgstr "Onemogući kameru i prestani da šalješ video"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Pregled"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Isklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Omogući kameru, ali ne šalji video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Uklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Uklj. kameru"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Pregled videa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Omogući kameru i šalji video"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Mapa prijatelja"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Sačuvaj"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Veza kante odlaganja"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Odgovor kante odlaganja"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Podaci su preveliki za jedno odlaganje. Sačuvajte zapisnike u datoteku."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Prozor za otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Pošalji u kantu odlaganja"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
-msgstr "Nivo: "
+msgstr "Nivo "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Otklanjanje grešaka"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Informacije"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Kritičan"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Greška"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Domen"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Kategorija"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Nivo"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Izabrani upravnik veze ne podržava proširenje za udaljeno otklanjanje grešaka."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Pozovi učesnike"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Pozovi"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Ne prikazuj nijedno prozorče; uradi posao koji imaš (npr. uvoženje) i izađi"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Ne prikazuj nijedno prozorče osim ako ne postoje samo nalozi „Ljudi u blizini“"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Početno izabiranje datog naloga (npr. gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<identifikacija naloga>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— Nalozi Pismonoše"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Nalozi Pismonoše"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "Prikaži posebnu uslugu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "— Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Otklanjanje grešaka Pismonoše"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— Pismonoša program za ćaskanje"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Odbaci"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Javi se"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Odgovori sa videom"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Prihvati"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Obezbedi"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s je pokušao da vas zove, ali ste vi bili na drugoj vezi."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "Na čekanju"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Utišaj"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "Vaše trenutno stanje je %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "Izvinite, ali nemate dovoljno kredita za ovaj poziv."
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "Dopuni"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uporedi veličinu slova"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Koji tip naloga za ćaskanje imate?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Dodajem novi nalog"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Ljudi u okolini"
+
+#: ../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."
+msgstr ""
+"Pismonoša može automatski da otkrije i ćaska sa ljudima koji su povezani na "
+"istu mrežu kao i vi. Ako želite da koristite ovu mogućnost, proverite da li "
+"su detalji ispod tačni."
+
+#: ../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 ""
+"Možete kasnije da izmenite te detalje ili da isključite ovu mogućnost tako što "
+"ćete izabrati <span style=\"italic\">Uredi → Nalozi</span> sa spiska "
+"kontakata."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Greška pri uvoženju naloga."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Greška pri obradi detalja naloga."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Greška pri pravljenju naloga."
+
+#~ msgid "There was an error."
+#~ msgstr "Dogodila se greška."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Ispisana poruka greške: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Možete se ili vratiti i probati da ponovo unesete detalje naloga ili da "
+#~ "zatvorite pomoćnika i dodate naloge kasnije iz menija „Izmeni“."
+
+#~ msgid "An error occurred"
+#~ msgstr "Došlo je do greške"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Da li imate još neki nalog za ćaskanje koji želite da podesite?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Unesite detalje naloga"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Koji tip naloga za ćaskanje želite da napravite?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Da li želite da napravite još naloga za ćaskanje?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Unesite detalje novog naloga"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Sa Internet Pismonošom možete ćaskati i sa ljudima u blizini i sa "
+#~ "prijateljima i kolegama koji koriste Gugl razgovor, AIM, Vindouz uživo i "
+#~ "mnoge druge programe za ćaskanje. Sa mikrofonom i kamerom takođe možete da "
+#~ "obavljate i audio i video pozive."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr ""
+#~ "Da li imate nalog koji ste koristili sa nekim drugim programom za ćaskanje?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Da, uvezi detalje mog naloga iz "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Da, ja ću sam uneti detalje naloga"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ne, želim novi nalog"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ne, za sada samo želim da vidim ljude u blizini"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Izaberite naloge koje želite da uvezete:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ne, to je sve za sada"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Izmeni->Nalozi"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Za sada _ne želim da koristim ovu mogućnost"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ne mogu da ćaskam sa ljudima povezanim na vašu lokalnu mrežu jer telepathy-"
+#~ "salut nije instaliran. Ako želite da omogućite ovo, instalirajte paket "
+#~ "telepathy-salut i napravite nalog „Ljudi u okolini“ iz prozorčeta „Nalozi“."
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut nije instaliran"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Asistent naloga za brze poruke i VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Dobrodošli u Internet Pismonošu"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Uvezite vaše postojeće naloge"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Unesite lične podatke"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokol:"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Prikazuje pomoćnika naloga"
+
+#~ msgid "Call volume"
+#~ msgstr "Jačina zvuka poziva"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "Jačina zvuka poziva, u procentima."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Pismonoša je prebacio dnevnike iz leptira"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Da li je Pismonoša prebacio dnevnike iz leptira."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Vrsta priključka nije podržana"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Moji veb nalozi"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Nalog %s je izmenjen putem %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Nalog %s ne može biti uređivan iz Pismonoše."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Pokreni Moje veb naloge"
+
+#~ msgid "Edit %s"
+#~ msgstr "Izmeni %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Po_ništi"
+
+#~ msgid "Personal Information"
+#~ msgstr "Podaci o profilu"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupisano"
+
+#~ msgid "Favorite People"
+#~ msgstr "Omiljeni ljudi"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Izm_eni"
+
+#~ msgid "Select a contact"
+#~ msgstr "Izaberite prijatelja"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Povezani prijatelji"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izaberite prijatelja za povezivanje"
+
+#~ msgid "New contact preview"
+#~ msgstr "Pregled novog prijatelja"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Označeni prijatelji na spisku levo će biti uvezani zajedno."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Poveži kontakte…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Poveži prijatelje"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Razveži…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
+
+#~ msgid "_Link"
+#~ msgstr "_Uveži"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Da razvežem uvezanog prijatelja „%s“?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Da li ste sigurni da želite da razvežete uvezanog prijatelja? Ovim ćete "
+#~ "razdvojiti uvezane kontakte u posebne prijatelje."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Razveži"
+
+#~ msgid "Contact ID:"
+#~ msgstr "IB prijatelja:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ć_askaj"
+
+#~ msgid "Send _Video"
+#~ msgstr "Pošalji _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Pozovi"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Postavite vaše prisustvo i trenutno stanje"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Izabrani prijatelj ne može da primi datoteke."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Izabrani prijatelj nije na vezi."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ovim ćete napraviti novi nalog, zanemarivši unete izmene.\n"
+#~ "Da li sigurno želite da nastavite?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgid "_Personal Information"
+#~ msgstr "Lični _podaci"
+
+#~ msgid "Input level:"
+#~ msgstr "Ulazni nivo:"
+
+#~ msgid "Input volume:"
+#~ msgstr "Jačina ulaznog zvuka:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Otvaraj ćaskanja u novim prozorima"
+
 #~ msgid "All"
 #~ msgstr "Sve"
 
diff --git a/po/sv.po b/po/sv.po
index c3dc9f9ed..0841c9c33 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-18 12:37+0100\n"
-"PO-Revision-Date: 2012-01-18 12:42+0100\n"
+"POT-Creation-Date: 2012-02-19 00:52+0100\n"
+"PO-Revision-Date: 2012-02-19 00:56+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -21,434 +21,451 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Chatta på Google Talk, Facebook, MSN och många andra chattjänster"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Snabbmeddelandeklient"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Meddelandeklienten Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Snabbmeddelandeklient"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Chatta på Google Talk, Facebook, MSN och många andra chattjänster"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2411
+msgid "Messaging and VoIP Accounts"
+msgstr "Meddelande och VoIP-konton"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Hantera konton för meddelanden och VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Öppna alltid ett separat fönster för nya chattar."
+msgid "Connection managers should be used"
+msgstr "Anslutningshanterare ska användas"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Kameraenhet"
+msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
+msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Kameraposition"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy ska ansluta automatiskt vid uppstart"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Chattfönstertema"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Temavariant för chattfönster"
+msgid "Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
+msgid "Empathy default download folder"
+msgstr "Standardhämtningsmapp för Empathy"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Kompakt kontaktlista"
+msgid "The default folder to save file transfers in."
+msgstr "Standardmappen att spara filöverföringar i."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Anslutningshanterare ska användas"
+msgid "Show offline contacts"
+msgstr "Visa frånkopplade kontakter"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Sorteringskriteria för kontaktlista"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
+msgid "Show avatars"
+msgstr "Visa profilbilder"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
+msgid "Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Standardkatalog att välja en profilbild från"
+msgid "Show protocols"
+msgstr "Visa protokoll"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Inaktivera popupnotifieringar under frånvaro"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Inaktivera ljud under frånvaro"
+msgid "Show Balance in contact list"
+msgstr "Visa saldo i kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Visa inkommande händelser i statusytan"
+msgid "Whether to show account balances in the contact list."
+msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area. If false, present them to the user immediately."
-msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
+msgid "Compact contact list"
+msgstr "Kompakt kontaktlista"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Stöd för ekosläckning"
+msgid "Whether to show the contact list in compact mode."
+msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
 
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy kan publicera användarens plats"
+msgid "Hide main window"
+msgstr "Dölj huvudfönstret"
 
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy kan använda GPS:en för att gissa platsen"
+msgid "Hide the main window."
+msgstr "Dölj huvudfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
+msgid "Default directory to select an avatar image from"
+msgstr "Standardkatalog att välja en profilbild från"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy kan använda nätverket för att gissa platsen"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Den senaste katalogen som en profilbild valdes från."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Standardhämtningsmapp för Empathy"
+msgid "Open new chats in separate windows"
+msgstr "Öppna nya chattar i separata fönster"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy ska ställa in automatiskt frånvaro vid inaktivitet"
+msgid "Always open a separate chat window for new chats."
+msgstr "Öppna alltid ett separat fönster för nya chattar."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy ska ansluta automatiskt vid uppstart"
+msgid "Display incoming events in the status area"
+msgstr "Visa inkommande händelser i statusytan"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy bör minska precisionen för platsen"
+msgid "Display incoming events in the status area. If false, present them to the user immediately."
+msgstr "Visa inkommande händelser i statusytan. Om false, visa dem direkt för användaren."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
+msgid "The position for the chat window side pane"
+msgstr "Positionen för chattfönstrets sidopanel"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Aktivera utvecklingsverktyg för WebKit"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Aktivera popupnotifieringar för nya meddelanden"
+msgid "Show contact groups"
+msgstr "Visa kontaktgrupper"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Aktivera stavningskontroll"
+msgid "Whether to show groups in the contact list."
+msgstr "Huruvida grupper ska visas i kontaktlistan."
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Dölj huvudfönstret"
+msgid "Contact list sort criterion"
+msgstr "Sorteringskriteria för kontaktlista"
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Dölj huvudfönstret."
+#, fuzzy
+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 "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Senast kontot valt i Gå in i rum-dialogen"
+msgid "Use notification sounds"
+msgstr "Använd notifieringsljud"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Tecken för smeknamnskomplettering"
+msgid "Whether to play a sound to notify of events."
+msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Öppna nya chattar i separata fönster"
+msgid "Disable sounds when away"
+msgstr "Inaktivera ljud under frånvaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Sökväg för Adium-temat att använda"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "Spela upp ljud för inkommande meddelanden"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Spela upp ett ljud för nya samtal"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "Spela upp ljud för utgående meddelanden"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Spela upp ljud när en kontakt loggar in"
+msgid "Play a sound for new conversations"
+msgstr "Spela upp ett ljud för nya samtal"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Spela upp ett ljud när en kontakt loggar ut"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Spela upp ljud när vi loggar in"
+msgid "Play a sound when a contact logs in"
+msgstr "Spela upp ljud när en kontakt loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Spela upp ljud när vi loggar ut"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
+msgid "Play a sound when a contact logs out"
+msgstr "Spela upp ett ljud när en kontakt loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Visa popupnotifieringar när en kontakt loggar in"
+msgid "Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Visa popupnotifieringar när en kontakt loggar ut"
+msgid "Play a sound when we log in"
+msgstr "Spela upp ljud när vi loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Positionera kameravisningen som den ska vara under ett samtal."
+msgid "Whether to play a sound when logging into a network."
+msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Visa saldo i kontaktlista"
+msgid "Play a sound when we log out"
+msgstr "Spela upp ljud när vi loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Visa profilbilder"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Visa kontaktlista i rum"
+msgid "Enable popup notifications for new messages"
+msgstr "Aktivera popupnotifieringar för nya meddelanden"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Visa tips om att stänga huvudfönstret"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Visa frånkopplade kontakter"
+msgid "Disable popup notifications when away"
+msgstr "Inaktivera popupnotifieringar under frånvaro"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Visa protokoll"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Rättstavningsspråk"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Visa popupnotifieringar om chatten inte är fokuserad"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Standardmappen att spara filöverföringar i."
+msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
+msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Den senaste katalogen som en profilbild valdes från."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Visa popupnotifieringar när en kontakt loggar in"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Positionen för chattfönstrets sidopanel"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Den lagrade positionen (i bildpunkter) för chattfönstrets sidopanel."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Visa popupnotifieringar när en kontakt loggar ut"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Det tema som används för att visa samtal i chattfönster."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme variant that is used to display the conversation in chat windows."
-msgstr "Den temavariant som används för att visa samtalet i chattfönster."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "Använd grafiska smilisar"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Använd notifieringsljud"
+msgid "Show contact list in rooms"
+msgstr "Visa kontaktlista i rum"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Använd tema för chattrum"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Huruvida kontaktlistan ska visas i chattrum."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
+msgid "Chat window theme"
+msgstr "Chattfönstertema"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Det tema som används för att visa samtal i chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
+msgid "Chat window theme variant"
+msgstr "Temavariant för chattfönster"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
+msgid "The theme variant that is used to display the conversation in chat windows."
+msgstr "Den temavariant som används för att visa samtalet i chattfönster."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Huruvida Empathy automatiskt ska logga in med dina konton vid uppstart."
+msgid "Path of the Adium theme to use"
+msgstr "Sökväg för Adium-temat att använda"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Huruvida Empathy automatiskt ska gå in i frånvaroläge om användaren är inaktiv."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Sökväg för Adium-temat som ska användas om temat som används för chatt är Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
+msgid "Enable WebKit Developer Tools"
+msgstr "Aktivera utvecklingsverktyg för WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "Huruvida utvecklingsverktyg för WebKit, såsom Webbinspekteraren, ska aktiveras."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr ""
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether connectivity managers should be used to automatically disconnect/reconnect."
-msgstr "Huruvida anslutningshanterare ska användas för att automatiskt koppla från/återansluta."
+msgid "Whether to send the 'composing' or 'paused' chat states. Does not currently affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to check words typed against the languages you want to check with."
-msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
+msgid "Use theme for chat rooms"
+msgstr "Använd tema för chattrum"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Huruvida smilisar ska omvandlas till grafiska bilder i samtal."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Huruvida temat för chattrum ska användas."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras."
+msgid "Spell checking languages"
+msgstr "Rättstavningsspråk"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar in i nätverket."
+msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "Kommaseparerad lista av språk att använda för stavningskontroll (t.ex. \"sv, en, fr\")."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Huruvida ett ljud ska spelas upp för kontakter som loggar ut från nätverket."
+msgid "Enable spell checker"
+msgstr "Aktivera stavningskontroll"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Huruvida ett ljud ska spelas upp för att notifiera om händelser."
+msgid "Whether to check words typed against the languages you want to check with."
+msgstr "Huruvida ord som matas in ska kontrolleras mot de språk som du vill kontrollera med."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Huruvida ett ljud ska spelas upp för inkommande meddelanden."
+msgid "Nick completed character"
+msgstr "Tecken för smeknamnskomplettering"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Huruvida ett ljud ska spelas upp för nya samtal."
+msgid "Character to add after nickname when using nick completion (tab) in group chat."
+msgstr "Tecken att lägga till efter smeknamn när smeknamnskomplettering (tab) används i gruppchatt."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Huruvida ett ljud ska spelas upp för utgående meddelanden."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy ska använda profilbilden för kontakten som ikon i chattfönstret"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Huruvida ett ljud ska spelas upp vid inloggning i ett nätverk."
+msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Huruvida Empathy ska använda profilbilden för kontakten som ikon i chattfönstret."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Huruvida ett ljud ska spelas upp vid utloggning från ett nätverk."
+msgid "Last account selected in Join Room dialog"
+msgstr "Senast kontot valt i Gå in i rum-dialogen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Huruvida ljudnotifieringar ska spelas upp vid frånvaro eller upptagen."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Sökväg för D-Bus-objektet för senaste kontot valt för att gå in i ett rum."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Huruvida popupnotifieringar ska visas när en kontakt kopplar från."
+msgid "Camera device"
+msgstr "Kameraenhet"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Huruvida popupnotifieringar ska visas när en kontakt ansluter."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Standardenhet för kamera att använda i videosamtal, t.ex. /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when receiving a new message even if the chat is already opened, but not focused."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot, även om chatten redan är öppnad, men inte fokuserad."
+msgid "Camera position"
+msgstr "Kameraposition"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Huruvida en popupnotifiering ska visas när ett nytt meddelande tas emot."
+msgid "Position the camera preview should be during a call."
+msgstr "Positionera kameravisningen som den ska vara under ett samtal."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Huruvida kontosaldon ska visas i kontaktlistan."
+msgid "Echo cancellation support"
+msgstr "Stöd för ekosläckning"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Huruvida profilbilder ska visas för kontakter i kontaktlistan och chattfönster."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Huruvida Pulseaudios filter för ekosläckning ska aktiveras."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Huruvida frånkopplade kontakter ska visas i kontaktlistan."
+msgid "Show hint about closing the main window"
+msgstr "Visa tips om att stänga huvudfönstret"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Huruvida popupnotifieringar ska visas vid frånvaro eller upptagen."
+msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
+msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Huruvida protokoll för kontakter ska visas i kontaktlistan."
+msgid "Empathy can publish the user's location"
+msgstr "Empathy kan publicera användarens plats"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Huruvida kontaktlistan ska visas i chattrum."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Huruvida Empathy kan publicera användarens plats till sina kontakter."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Huruvida kontaktlistan ska visas i kompakt läge."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy kan använda nätverket för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the message dialog about closing the main window with the 'x' button in the title bar."
-msgstr "Huruvida meddelandedialogen om att stänga huvudfönstret ska visas när man klickar på \"x\"-knappen i titelraden."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Huruvida Empathy kan använda nätverket för att gissa platsen."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Huruvida temat för chattrum ska användas."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy kan använda mobiltelefonnätet för att gissa platsen"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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."
-msgstr "Vilket kriteria som ska användas när kontaktlistan sorteras. Standard är att sortera efter kontaktens namn med värdet \"name\". Värdet \"state\" kommer att sortera kontaktlistan efter tillstånd."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Huruvida Empathy kan använda mobiltelefonnätet för att gissa platsen."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Hantera konton för meddelanden och VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy kan använda GPS:en för att gissa platsen"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "Meddelande och VoIP-konton"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Huruvida Empathy kan använda GPS för att gissa platsen."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy bör minska precisionen för platsen"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Huruvida Empathy ska minska platsens precision av integritetsskäl."
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -475,7 +492,7 @@ msgid "The other participant is unable to transfer the file"
 msgstr "Den andra deltagaren kunde inte överföra filen"
 
 #: ../libempathy/empathy-ft-handler.c:754
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -512,212 +529,216 @@ msgstr "Ringde %s"
 msgid "Call from %s"
 msgstr "Samtal från %s"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Frånkopplad"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Okänt"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Ingen anledning angavs"
 
-#: ../libempathy/empathy-utils.c:285
-#: ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Status är inställd till frånkopplad"
 
-#: ../libempathy/empathy-utils.c:287
-#: ../libempathy/empathy-utils.c:321
+#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Nätverksfel"
 
-#: ../libempathy/empathy-utils.c:289
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libempathy/empathy-utils.c:291
-#: ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Krypteringsfel"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Namnet används"
 
-#: ../libempathy/empathy-utils.c:295
-#: ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Certifikat inte tillhandahållet"
 
-#: ../libempathy/empathy-utils.c:297
-#: ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Certifikatet är inte betrott"
 
-#: ../libempathy/empathy-utils.c:299
-#: ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Certifikatet har gått ut"
 
-#: ../libempathy/empathy-utils.c:301
-#: ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Certifikatet är inte aktiverat"
 
-#: ../libempathy/empathy-utils.c:303
-#: ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Värdnamnet i certifikatet stämmer inte"
 
-#: ../libempathy/empathy-utils.c:305
-#: ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Certifikatets fingeravtryck stämmer inte"
 
-#: ../libempathy/empathy-utils.c:307
-#: ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Självsignerat certifikat"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Certifikatfel"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Kryptering är inte tillgängligt"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Certifikatet är ogiltigt"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Anslutningen vägrades"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Anslutningen kunde inte etableras"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Anslutningen förlorades"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "Denna resurs är redan ansluten till servern"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Detta konto är redan anslutet till servern"
+
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "Anslutningen har ersatts av en ny anslutning med samma resurs"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Kontot finns redan på servern"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Servern är för tillfället för upptagen för att hantera anslutningen"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Certifikatet har spärrats"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "Certifikatet använder en osäker skifferalgoritm eller är kryptografiskt svag"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid "The length of the server certificate, or the depth of the server certificate chain, exceed the limits imposed by the cryptography library"
 msgstr "Längd på servercertifikatet, eller djup för servercertifikatkedjan, överstiger begränsningen för krypteringsbiblioteket"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Din programvara är för gammal"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Internt fel"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Personer i närheten"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook-chatt"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d sekund sedan"
 msgstr[1] "%d sekunder sedan"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d minut sedan"
 msgstr[1] "%d minuter sedan"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d timme sedan"
 msgstr[1] "%d timmar sedan"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d dag sedan"
 msgstr[1] "%d dagar sedan"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d vecka sedan"
 msgstr[1] "%d veckor sedan"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d månad sedan"
 msgstr[1] "%d månader sedan"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "i framtiden"
 
@@ -726,7 +747,7 @@ msgid "All accounts"
 msgstr "Alla konton"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Konto"
 
@@ -744,30 +765,30 @@ msgstr "Server"
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "V_erkställ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "L_ogga in"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Detta konto finns redan på servern"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Skapa ett nytt konto på servern"
 
@@ -776,137 +797,137 @@ msgstr "Skapa ett nytt konto på servern"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s på %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:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s-konto"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Nytt konto"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Exempel:</b> MittSkärmnamn"
+#: ../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:"
+msgstr "L_ösenord:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Avancerat"
+msgid "Screen _Name:"
+msgstr "Skärm_namn:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Exempel:</b> MittSkärmnamn"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "L_ösenord:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Kom ihåg lösenordet"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Kom ihåg lösenordet"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Kom ihåg lösenordet"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "Skärm_namn:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Vad är ditt AIM-lösenord?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Avancerat"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Vad är ditt AIM-skärmnamn?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Vad är ditt AIM-lösenord?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Exempel:</b> användarnamn"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Kom ihåg lösenordet"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "Inloggningsi_d:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Exempel:</b> användarnamn"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Vad är ditt användar-id för GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Vad är ditt lösenord för GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Exempel:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Te_ckenuppsättning:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Vad är ditt ICQ UIN?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Vad är ditt ICQ-lösenord?"
 
@@ -943,21 +964,25 @@ msgstr "Options"
 msgid "None"
 msgstr "Ingen"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Nätverk"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
-msgid "Character set:"
-msgstr "Teckenuppsättning:"
+msgid "Network:"
+msgstr "Nätverk:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
-msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
+msgid "Character set:"
+msgstr "Teckenuppsättning:"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Nätverk"
+msgid "Servers"
+msgstr "Servrar"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Nätverk:"
+msgid "Most IRC servers don't need a password, so if you're not sure, don't enter a password."
+msgstr "De flesta IRC-servrar behöver inte något lösenord. Ange endast ett lösenord om du är säker på att det behövs."
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
@@ -975,48 +1000,20 @@ msgstr "Avslutningsmeddelande:"
 msgid "Real name:"
 msgstr "Verkligt namn:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Servrar"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Vad är ditt IRC-smeknamn?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Vilket IRC-nätverk?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Exempel:</b> användare@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Exempel:</b> användare@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Kr_yptering krävs (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "I_gnorera SSL-certifikatfel"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Åsidosätt serverinställningar"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "Pri_oritet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Vad är ditt IRC-smeknamn?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Resurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Vad är ditt användarnamn för Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1026,179 +1023,203 @@ msgstr ""
 "Om du har facebook.com/<b>hamster</b> så ange <b>hamster</b>.\n"
 "Använd <a href=\"http://www.facebook.com/username/\">denna sida</a> för att välja ett Facebook-användarnamn om du inte redan har ett."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Använd gammal SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Vad är ditt Facebook-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Vad är ditt användarnamn för Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Vad är ditt Google ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Exempel:</b> användare@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Vad är ditt Google-lösenord?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Exempel:</b> användare@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "I_gnorera SSL-certifikatfel"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "Pri_oritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Kr_yptering krävs (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Använd gammal SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Åsidosätt serverinställningar"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Vad är ditt Jabber ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Vad är ditt Jabber-lösenord?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Vilket Jabber ID vill du använda?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Vad är ditt Jabber-lösenord?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Vilket lösenord vill du använda för Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Exempel:</b> användare@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Vad är ditt id för Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Vad är ditt lösenord för Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "E-_postadress:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "S_meknamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Efternamn:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Förnamn:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Publikt namn:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber-id:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Efternamn:"
+msgid "E-_mail address:"
+msgstr "E-_postadress:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Publikt namn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "A_nvändarnamn:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Exempel:</b> användare@min.sipserver"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Användarnamn för autentisering:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Upptäck bindning"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Upptäck STUN-servern automatiskt"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Använd detta konto för att ringa _fasta telefoner och mobiltelefoner"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ignorera TLS-fel"
+msgid "NAT Traversal Options"
+msgstr "Flaggor för NAT-traversering"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Intervall (sekunder)"
+msgid "Proxy Options"
+msgstr "Proxyalternativ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive-flaggor"
+msgid "Miscellaneous Options"
+msgstr "Diverse alternativ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Loose Routing"
+msgid "STUN Server:"
+msgstr "STUN-server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mekanism:"
+msgid "Discover the STUN server automatically"
+msgstr "Upptäck STUN-servern automatiskt"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Diverse alternativ"
+msgid "Discover Binding"
+msgstr "Upptäck bindning"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Flaggor för NAT-traversering"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive-flaggor"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mekanism:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Proxyalternativ"
+msgid "Interval (seconds)"
+msgstr "Intervall (sekunder)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Användarnamn för autentisering:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN-server:"
+msgid "Loose Routing"
+msgstr "Loose Routing"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Ignorera TLS-fel"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Använd detta konto för att ringa _fasta telefoner och mobiltelefoner"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Vad är lösenordet för ditt SIP-konto?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Vad är ditt inloggnings-id för SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "A_nvändarnamn:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Vad är lösenordet för ditt SIP-konto?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo!-I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "I_gnorera inbjudningar till konferenser och chattrum"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lokalanpassning för _rumslista:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Vad är ditt Yahoo! ID?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Vad är ditt Yahoo!-lösenord?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo!-I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lokalanpassning för _rumslista:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1261,188 +1282,194 @@ msgstr "Nödsamtal stöds inte med detta protokollet"
 msgid "You don't have enough credit in order to place this call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "Misslyckades med att öppna privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "Ämne stöds inte för detta samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "Du tillåts inte att ändra ämnet"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "\"%s\" är inte ett giltigt kontakt-id"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: töm alla meddelanden från det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ämne>: ställ in ämnet för det aktuella samtalet"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chattrummets ID>: gå in i ett nytt chattrum"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid "/part [<chat room ID>] [<reason>]: leave the chat room, by default the current one"
 msgstr "/part [<chattrummets ID>] [<anledning>]: lämna chattrummet, det aktuella som standard"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <kontaktens ID> [<meddelande>]: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <kontaktens ID> <meddelande>: öppna en privat chatt"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <smeknamn>: ändra ditt smeknamn på aktuell server"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <meddelande>: skicka ett ACTION-meddelande till aktuellt samtal"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid "/say <message>: send <message> to the current conversation. This is used to send a message starting with a '/'. For example: \"/say /join is used to join a new chat room\""
 msgstr "/say <meddelande>: skicka <meddelande> till det aktuella samtalet. Detta används för att skicka ett meddelande som börjar med ett \"/\". Till exempel: \"/say /join används för att gå in i ett nytt chattrum\""
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <kontakt-id>: visa information om en kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid "/help [<command>]: show all supported commands. If <command> is defined, show its usage."
 msgstr "/help [<kommando>]: visa alla kommandon som stöds. Om <kommando> har definierats, visa dess användning."
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "Användning: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "Okänt kommando"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "Okänt kommando; se /help för tillgängliga kommandon"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1460
-#: ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568
+#: ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Fel vid sändning av meddelandet \"%s\": %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462
-#: ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570
+#: ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Fel vid sändning av meddelande: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, fuzzy, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "otillräckliga medel på kontot för att skicka meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "inte kapabel"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "frånkopplad"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ogiltig kontakt"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "åtkomst nekad"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "för långt meddelande"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "inte implementerat"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "okänt"
 
-#: ../libempathy-gtk/empathy-chat.c:1598
-#: ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706
+#: ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Ämne:"
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Ämnet inställt till: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "Ämnet angivet av %s till: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "Inget ämne definierat"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(Inga förslag)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Lägg till \"%s\" till ordbok"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Lägg till \"%s\" till %s-ordboken"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "Infoga smilis"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
+#: ../libempathy-gtk/empathy-chat.c:2437
 #: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_Skicka"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "Sta_vningsförslag"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "Misslyckades med att hämta senaste loggar"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s har kopplat från"
@@ -1450,12 +1477,12 @@ msgstr "%s har kopplat från"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s sparkades ut av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s sparkades ut"
@@ -1463,17 +1490,17 @@ msgstr "%s sparkades ut"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s blev bannlyst av %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s blev bannlyst"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s har lämnat rummet"
@@ -1483,17 +1510,17 @@ msgstr "%s har lämnat rummet"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s har gått in i rummet"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
@@ -1501,58 +1528,58 @@ msgstr "%s är nu känd som %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:2846
+#: ../libempathy-gtk/empathy-chat.c:2993
 #: ../src/empathy-streamed-media-window.c:1889
 #: ../src/empathy-event-manager.c:1280
-#: ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588
-#: ../src/empathy-call-window.c:2631
+#: ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595
+#: ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "Vill du lagra detta lösenord?"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "Kom ihåg"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "Inte nu"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Försök igen"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "Felaktigt lösenord. Försök igen:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "Detta rum är skyddat med ett lösenord:"
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "Gå in"
 
-#: ../libempathy-gtk/empathy-chat.c:3901
+#: ../libempathy-gtk/empathy-chat.c:4070
 #: ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "Samtal"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1584,10 +1611,10 @@ msgstr "Redigera blockerade kontakter"
 #. 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:2
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 #: ../libempathy-gtk/empathy-individual-widget.c:1474
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Konto:"
 
@@ -1597,7 +1624,7 @@ msgstr "Blockerade kontakter"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Ta bort"
@@ -1620,33 +1647,29 @@ msgstr "_Öppna länk"
 msgid "%A %B %d %Y"
 msgstr "%A %e %B %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "Personlig information"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Ny kontakt"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Blockera %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 "Är du säker på att du vill blockera \"%s\" från att kontakta dig igen?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_Blockera"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1654,17 +1677,17 @@ msgstr[0] "_Rapportera denna kontakt som stötande"
 msgstr[1] "_Rapportera dessa kontakter som stötande"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Bestäm _senare"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "_Blockera användare"
 
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Bestäm _senare"
+
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
@@ -1819,7 +1842,7 @@ msgstr "Höjd:"
 #: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Plats"
 
@@ -1845,6 +1868,16 @@ msgstr "Spara profilbild"
 msgid "Unable to save avatar"
 msgstr "Kunde inte spara profilbild"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Personliga detaljer"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Kontaktuppgifter"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "Fullständigt namn"
@@ -1911,49 +1944,44 @@ msgstr "postadress"
 msgid "parcel"
 msgstr "leveransadress"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Plats</b> den (datum)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Identifierare:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 #: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Alias:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Klientinformation"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Klient:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Plats</b> den (datum)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Kontaktuppgifter"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Information begärd..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "Identifierare:"
+msgid "Client Information"
+msgstr "Klientinformation"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Information begärd..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Version:"
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Klient:"
+
 #: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupper"
@@ -1972,7 +2000,7 @@ msgid "Select"
 msgstr "Välj"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1919
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Grupp"
 
@@ -1992,161 +2020,145 @@ msgstr[1] "Följande identiteter kan inte blockeras:"
 msgid "Edit Contact Information"
 msgstr "Redigera kontaktinformation"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Länkade kontakter"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Välj kontakter att länka"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Förhandsvisa ny kontakt"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop."
-
 #. 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:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Välj konto att använda för att ringa samtalet"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Ring"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Arbete"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "HEM"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "_Blockera kontakt"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:16
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "_Chat"
 msgstr "_Chatt"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "_Ljudsamtal"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "_Videosamtal"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "_Previous Conversations"
 msgstr "Ti_digare samtal"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "Dela ut mitt skrivbord"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "Favorit"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts är inte installerat"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "Infor_mation"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "R_edigera"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Länka kontakter..."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "Bjuder in dig till detta rum"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "_Bjud in till chattrum"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
-#: ../src/empathy-roster-window-menubar.ui.h:14
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "_Add Contact…"
 msgstr "_Lägg till kontakt..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2301
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Ta bort och _blockera"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2336
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Vill du verkligen ta bort gruppen \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Tar bort grupp"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2394
-#: ../libempathy-gtk/empathy-individual-view.c:2611
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2471
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Vill du verkligen ta bort kontakten \"%s\"?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2480
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, 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 "Vill du verkligen ta bort den länkade kontakten \"%s\"? Observera att detta kommer att ta bort alla kontakter som denna länkade kontakt innehåller."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2492
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Tar bort kontakt"
 
@@ -2161,7 +2173,7 @@ msgstr[1] "Länkade kontakter innehåller %u kontakter"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Plats</b> den (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Ansluten från en telefon eller mobil enhet"
 
@@ -2190,44 +2202,6 @@ msgstr "ny server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Länka kontakter"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "A_vlänka..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Länka"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Avlänka länkade kontakter \"%s\"?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid "Are you sure you want to unlink these linked contacts? This will completely split the linked contacts into separate contacts."
-msgstr "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer helt att dela upp de länkade kontakterna till separata kontakter."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "Av_länka"
-
 #: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Historik"
@@ -2329,7 +2303,7 @@ msgid "Text chats"
 msgstr "Textchattar"
 
 #: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Samtal"
 
@@ -2362,43 +2336,43 @@ msgid "Delete from:"
 msgstr "Ta bort från:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Läser in...</span>"
+msgid "_File"
+msgstr "_Arkiv"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Chatta"
+#: ../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 "R_edigera"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Ta bort all historik..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Chatta"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "R_edigera"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Arkiv"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "sida 2"
 
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Läser in...</span>"
+
 #: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Kontakten är frånkopplad"
@@ -2530,20 +2504,20 @@ msgid "Find:"
 msgstr "Sök:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "Mat_cha skiftläge"
+msgid "_Previous"
+msgstr "_Föregående"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Frasen hittades inte"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Nästa"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "Mat_cha skiftläge"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Föregående"
+msgid "Phrase not found"
+msgstr "Frasen hittades inte"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2589,12 +2563,12 @@ msgstr "Röstsamtal avslutat"
 msgid "Edit Custom Messages"
 msgstr "Redigera anpassade meddelanden"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Meddelandet redigerat %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normal"
 
@@ -2670,18 +2644,22 @@ msgstr "Certifikatets värdnamn: %s"
 
 # Hm?
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Fortsätt"
+msgid "C_ontinue"
+msgstr "F_ortsätt"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Opålitlig anslutning"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Denna anslutning är inte pålitlig. Vill du fortsätta ändå?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Kom ihåg detta val för framtida anslutningar"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Certifikatinformation"
 
@@ -2936,203 +2914,73 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Det inträffade ett fel när konton importerades."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Det inträffade ett fel vid tolkning av kontouppgifterna."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Det inträffade ett fel när kontot skapades."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Det inträffade ett fel."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Felmeddelandet var: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid "You can either go back and try to enter your accounts' details again or quit this assistant and add accounts later from the Edit menu."
-msgstr "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen eller avsluta denna guide och lägga till konton senare från Redigera-menyn."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "Ett fel inträffade"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "Vilken typ av chattkonto har du?"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "Ange dina kontouppgifter"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "Vilken typ av chattkonto vill du skapa?"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "Vill du skapa andra chattkonton?"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "Ange uppgifterna för det nya kontot"
-
-#: ../src/empathy-account-assistant.c:614
-msgid "With Empathy you can chat with people online nearby and with friends and colleagues who use Google Talk, AIM, Windows Live and many other chat programs. With a microphone or a webcam you can also have audio or video calls."
-msgstr "Med Empathy kan du chatta med anslutna personer i närheten och med vänner och kollegor som använder Google Talk, AIM, Windows Live och många andra chattprogram. Du kan även använda ljud- och videosamtal om du har en mikrofon eller webbkamera."
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "Har du ett konto som du har använt med andra chattprogram?"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "Ja, importera mina kontouppgifter från "
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "Ja, jag vill ange mina kontouppgifter nu"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "Nej, jag vill ha ett nytt konto"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "Välj de konton som du vill importera:"
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "Ja"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "Nej, det är allt för stunden"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid "Empathy can automatically discover and chat with the people connected on the same network as you. If you want to use this feature, please check that the details below are correct. You can easily change these details later or disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta. Du kan enkelt ändra dessa uppgifter senare eller inaktivera denna funktion genom att använda \"Konton\"-dialogrutan"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "Redigera->Konton"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "Jag vill _inte aktivera denna funktion just nu"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid "You won't be able to chat with people connected to your local network, as telepathy-salut is not installed. If you want to enable this feature, please install the telepathy-salut package and create a People Nearby account from the Accounts dialog"
-msgstr "Du kommer inte att kunna chatta med personer som är anslutna till ditt lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill aktivera denna funktion så installera paketet telepathy-salut och skapa ett Personer i närheten-konto från Konto-dialogrutan"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut är inte installerat"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Guide för meddelanden och VoIP-konton"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "Välkommen till Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "Importera dina befintliga konton"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "Ange personlig information"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:71
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Det finns osparade ändringar för ditt %s-konto."
 
 #. 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:73
+#: ../src/empathy-accounts-dialog.c:75
 msgid "Your new account has not been saved yet."
 msgstr "Ditt nya konto har inte sparats än."
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:347
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "Ansluter..."
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "Frånkopplad — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Frånkopplad — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "Frånkopplad — Ingen nätverksanslutning"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
 msgstr "Frånkopplad — Kontot är inaktiverat"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:533
 msgid "Edit Connection Parameters"
 msgstr "Redigera anslutningsdetaljer"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:696
 msgid "Failed to retrieve your personal information from the server."
 msgstr "Misslyckades med att hämta din personliga information från servern."
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:702
 msgid "Go online to edit your personal information."
 msgstr "Anslut dig för att redigera din personliga information."
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:787
 msgid "_Edit Connection Parameters..."
 msgstr "_Redigera anslutningsdetaljer..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1283
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Vill du ta bort %s från din dator?"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1287
 msgid "This will not remove your account on the server."
 msgstr "Detta kommer inte att ta bort ditt konto på servern."
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1523
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3141,15 +2989,23 @@ msgstr ""
 "förkasta dina ändringar. Är du säker att du vill fortsätta?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1699
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1700
 msgid "_Disable"
 msgstr "_Inaktivera"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2083
+msgid "_Skip"
+msgstr "_Hoppa över"
+
+#: ../src/empathy-accounts-dialog.c:2087
+msgid "_Connect"
+msgstr "An_slut"
+
+#: ../src/empathy-accounts-dialog.c:2264
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3161,25 +3017,21 @@ msgstr ""
 msgid "Add…"
 msgstr "Lägg till…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Läser in kontoinformation"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Inga protokoll installerade"
+msgid "_Import…"
+msgstr "_Importera…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Protokoll:"
+msgid "Loading account information"
+msgstr "Läser in kontoinformation"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "To add a new account, you first have to install a backend for each protocol you want to use."
 msgstr "För att lägga till ett nytt konto måste du först installera en bakände för varje protokoll som du vill använda."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Importera…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Inga protokollbakänder installerade"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3189,17 +3041,13 @@ msgstr "- Autentiseringsklienten Empathy"
 msgid "Empathy authentication client"
 msgstr "Autentiseringsklienten Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Personer i närheten"
-
 #: ../src/empathy-av.c:118
-#: ../src/empathy-call.c:193
+#: ../src/empathy-call.c:203
 msgid "- Empathy Audio/Video Client"
 msgstr "- Ljud/Videoklienten Empathy"
 
 #: ../src/empathy-av.c:134
-#: ../src/empathy-call.c:218
+#: ../src/empathy-call.c:228
 msgid "Empathy Audio/Video Client"
 msgstr "Ljud/Videoklienten Empathy"
 
@@ -3242,33 +3090,33 @@ msgstr "Detaljer"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "Ring med %s"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2178
 msgid "The IP address as seen by the machine"
 msgstr "IP-adressen som den ses av datorn"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2180
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP-adressen som den ses av en server på Internet"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2182
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP-adressen för klienten som den ses av andra sidan"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2184
 msgid "The IP address of a relay server"
 msgstr "IP-adressen för en reläserver"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2186
 msgid "The IP address of the multicast group"
 msgstr "IP-adressen för multicast-gruppen"
 
@@ -3287,312 +3135,345 @@ msgid "Connected — %d:%02dm"
 msgstr "Ansluten — %d:%02dm"
 
 #: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "Tekniska detaljer"
 
 #: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid "%s's software does not understand any of the audio formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de ljudformat som stöds av din dator"
 
 #: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid "%s's software does not understand any of the video formats supported by your computer"
 msgstr "Programvaran hos %s förstår inte något av de videoformat som stöds av din dator"
 
 #: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-call-window.c:3090
 #, c-format
 msgid "Can't establish a connection to %s. One of you might be on a network that does not allow direct connections."
 msgstr "Kan inte etablera en anslutning till %s. Någon av er kanske befinner er på ett nätverk som inte tillåter direktanslutningar."
 
 #: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "Det inträffade ett fel på nätverket"
 
 #: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-call-window.c:3100
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "Ljudformaten som krävs för detta samtal är inte installerade på din dator"
 
 #: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-call-window.c:3103
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "Videoformaten som krävs för detta samtal är inte installerade på din dator"
 
 #: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid "Something unexpected happened in a Telepathy component. Please <a href=\"%s\">report this bug</a> and attach logs gathered from the 'Debug' window in the Help menu."
 msgstr "Någonting oväntat hände i en Telepathy-komponent. <a href=\"%s\">Rapportera detta fel</a> och bifoga loggarna som samlats in från \"Felsök\"-fönstret i Hjälp-menyn."
 
 #: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "Det uppstod ett fel i samtalsmotorn"
 
 #: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3127
 msgid "The end of the stream was reached"
 msgstr "Slutet på strömmen nåddes"
 
 #: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "Kan inte etablera ljudström"
 
 #: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "Kan inte etablera videoström"
 
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-preferences.ui.h:2
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Ljud"
+msgid "_Call"
+msgstr "_Ring"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Avkodande kodek:"
+msgid "_Microphone"
+msgstr "_Mikrofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Inaktivera kamera"
+msgid "_Camera"
+msgstr "_Kamera"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Visa knappsatsen"
+msgid "_Settings"
+msgstr "_Inställningar"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodande kodek:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "_Visa"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Lägg på"
+#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "_Hjälp"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Avsluta aktuellt samtal"
+#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "I_nnehåll"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokal kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "_Felsökning"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Maximera mig"
+msgid "Swap camera"
+msgstr "Växla kamera"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Minimera mig"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Fjärrkandidat:"
+msgid "Maximise me"
+msgstr "Maximera mig"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Skicka ljud"
+msgid "Disable camera"
+msgstr "Inaktivera kamera"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Skicka video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Lägg på"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Visa knappsats"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Avsluta aktuellt samtal"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Videosamtal"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Starta ett videosamtal"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Starta ett röstsamtal"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Växla kamera"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Växla ljudöverföring"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Växla videoöverföring"
+msgid "Show dialpad"
+msgstr "Visa knappsats"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580
-#: ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582
-#: ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Okänt"
+msgid "Display the dialpad"
+msgstr "Visa knappsatsen"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Skicka video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Videosamtal"
+msgid "Toggle video transmission"
+msgstr "Växla videoöverföring"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Ring"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Skicka ljud"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamera"
-
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "I_nnehåll"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Växla ljudöverföring"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "_Felsökning"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodande kodek:"
+
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2587
+#: ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589
+#: ../src/empathy-call-window.c:2590
+msgid "Unknown"
+msgstr "Okänt"
 
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Hjälp"
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Avkodande kodek:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Mikrofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Fjärrkandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Inställningar"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokal kandidat:"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "_Visa"
+msgid "Audio"
+msgstr "Ljud"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Stäng detta fönster?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid "Closing this window will leave %s. You will not receive any further messages until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid "Closing this window will leave a chat room. You will not receive any further messages until you rejoin it."
+msgid_plural "Closing this window will leave %u chat rooms. You will not receive any further messages until you rejoin them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Lämna %s?"
 
-#: ../src/empathy-chat-window.c:481
-#: ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:315
+msgid "You will not receive any further messages from this chat room until you rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Stäng fönstret"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Lämna rummet"
+
+#: ../src/empathy-chat-window.c:640
+#: ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d oläst)"
 msgstr[1] "%s (%d olästa)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (och %u annat)"
 msgstr[1] "%s (och %u andra)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d oläst från andra)"
 msgstr[1] "%s (%d olästa från andra)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d oläst från alla)"
 msgstr[1] "%s (%d olästa från alla)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "Skickar %d meddelande"
 msgstr[1] "Skickar %d meddelanden"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Skriver ett meddelande."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "T_öm"
+msgid "_Conversation"
+msgstr "_Samtal"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "K_ontakt"
+msgid "C_lear"
+msgstr "T_öm"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Infoga _smilis"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Favoritchattrum"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Bjud in _deltagare…"
+msgid "Notify for All Messages"
+msgstr "Notifiera för alla meddelanden"
 
 #: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Flytta flik till _vänster"
+#: ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "_Visa kontaktlista"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Flytta flik till _höger"
+msgid "Invite _Participant…"
+msgstr "Bjud in _deltagare…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Notifiera för alla meddelanden"
+msgid "C_ontact"
+msgstr "K_ontakt"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Samtal"
+msgid "_Tabs"
+msgstr "_Flikar"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Koppla loss flik"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Favoritchattrum"
+msgid "_Previous Tab"
+msgstr "_Föregående flik"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Nästa flik"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Föregående flik"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "Ån_gra flikstängning"
 
-#: ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "_Visa kontaktlista"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Flytta flik till _vänster"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Flikar"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Flytta flik till _höger"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "Ån_gra flikstängning"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Koppla loss flik"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3606,7 +3487,7 @@ msgstr "Rum"
 msgid "Auto-Connect"
 msgstr "Anslut automatiskt"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Hantera favoritrum"
 
@@ -3615,7 +3496,7 @@ msgid "Incoming video call"
 msgstr "Inkommande videosamtal"
 
 #: ../src/empathy-event-manager.c:523
-#: ../src/empathy-call-window.c:1555
+#: ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
@@ -3632,7 +3513,7 @@ msgstr "%s ringer dig. Vill du svara?"
 #: ../src/empathy-event-manager.c:531
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Inkommande samtal från %s"
@@ -3652,7 +3533,7 @@ msgstr "S_vara med video"
 
 #: ../src/empathy-event-manager.c:732
 #: ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Inkommande videosamtal från %s"
@@ -3676,7 +3557,7 @@ msgid "_Decline"
 msgstr "_Neka"
 
 #: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Gå in"
 
@@ -3696,7 +3577,7 @@ msgid "Incoming file transfer from %s"
 msgstr "Inkommande filöverföring från %s"
 
 #: ../src/empathy-event-manager.c:1147
-#: ../src/empathy-roster-window.c:371
+#: ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Lösenord krävs"
 
@@ -3828,176 +3709,194 @@ msgstr "Filöverföringar"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Ta bort färdiga, avbrutna och misslyckade filöverföringar från listan"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Importera"
+
+#: ../src/empathy-import-dialog.c:88
 msgid "No accounts to import could be found. Empathy currently only supports importing accounts from Pidgin."
 msgstr "Inga konton att importera kunde hittas. Empathy har för närvarande endast stöd för att importera konton från Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Importera konton"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Importera"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Källa"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Ange lösenord"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Koppla ifrån"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Du måste konfigurera ett konto för att se kontakter här."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Ingen träff hittades"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Uppdatera programvara..."
 
-#: ../src/empathy-roster-window.c:805
-#: ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855
+#: ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Stäng"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Anslut igen"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Redigera konto"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Fyll på %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Fyll på kontot"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Fyll på..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
+
+#. 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 ""
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Kontaktlista"
 
-#: ../src/empathy-roster-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Kontakter på en ka_rta"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Kontoinställningar"
 
 #: ../src/empathy-roster-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Saldo"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Nytt samtal..."
 
-# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
-# inte ska hittas, döljer gör man för att det inte ska synas.
 #: ../src/empathy-roster-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Sök i kontakt_lista"
-
-#: ../src/empathy-roster-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Gå in i _favoriter"
-
-#: ../src/empathy-roster-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Hantera favoriter"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Nytt sa_mtal…"
 
 #: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormal storlek"
+msgid "_Search for Contacts…"
+msgstr "_Sök efter kontakter..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:7
-#: ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Nytt sa_mtal…"
+msgid "_File Transfers"
+msgstr "Fi_löverföringar"
 
 #: ../src/empathy-roster-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normal storlek med _profilbilder"
+msgid "_Offline Contacts"
+msgstr "_Frånkopplade kontakter"
 
 #: ../src/empathy-roster-window-menubar.ui.h:9
-msgid "P_references"
-msgstr "I_nställningar"
-
-#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "Visa protoko_ll"
 
-#: ../src/empathy-roster-window-menubar.ui.h:11
-msgid "Sort by _Name"
-msgstr "Sortera efter _namn"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Saldo"
 
-#: ../src/empathy-roster-window-menubar.ui.h:12
-msgid "Sort by _Status"
-msgstr "Sortera efter _status"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Kontakter på en ka_rta"
 
 #: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "_Konton"
 
-#: ../src/empathy-roster-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "_Blockerade kontakter"
 
-#: ../src/empathy-roster-window-menubar.ui.h:17
-msgid "_Compact Size"
-msgstr "_Kompakt storlek"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "I_nställningar"
+
+# Vi översätter "hide" med "dölj" i GNOME. Gömmer gör man något för att det
+# inte ska hittas, döljer gör man för att det inte ska synas.
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Sök i kontakt_lista"
+
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "Sortera efter _namn"
+
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "Sortera efter _status"
+
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normal storlek med _profilbilder"
 
 #: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Fi_löverföringar"
+msgid "N_ormal Size"
+msgstr "N_ormal storlek"
+
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "_Kompakt storlek"
 
 #: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Join…"
-msgstr "_Gå in..."
+msgid "_Room"
+msgstr "_Rum"
 
 #: ../src/empathy-roster-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Nytt samtal..."
+msgid "_Join…"
+msgstr "_Gå in..."
 
 #: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Frånkopplade kontakter"
+msgid "Join _Favorites"
+msgstr "Gå in i _favoriter"
 
 #: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Personlig information"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Rum"
-
-#: ../src/empathy-roster-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Sök efter kontakter..."
+msgid "Manage Favorites"
+msgstr "Hantera favoriter"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4024,6 +3923,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Nej"
 
@@ -4035,30 +3939,30 @@ msgstr "Kunde inte starta rumslistningen"
 msgid "Could not stop room listing"
 msgstr "Kunde inte stoppa rumslistningen"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Kunde inte läsa in rumslistan"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Gå in i rum"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "Ange rumsnamnet för att gå in i eller klicka på ett eller flera rum i listan."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Rum:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Enter the server which hosts the room, or leave it empty if the room is on the current account's server"
 msgstr "Ange servern som tillhandahåller rummet, eller lämna den tom om rummet finns på servern för det aktuella kontot"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Gå in i rum"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Kunde inte läsa in rumslistan"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Rumslista"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Rum:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Meddelande togs emot"
@@ -4072,7 +3976,7 @@ msgid "New conversation"
 msgstr "Nytt samtal"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Kontakt ansluter"
 
 #: ../src/empathy-preferences.c:170
@@ -4092,308 +3996,316 @@ msgid "Language"
 msgstr "Språk"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Julia"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Romeo, min Romeo, var är du Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Förneka din fader och vägra ditt namn;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Eller om du icke, men var svurit min kärlek"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Och jag kommer inte längre att vara en Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Skall jag höra mer, eller ska jag tala?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Julia har kopplat från"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Inställningar"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Visa _smilisar som bilder"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Visa kontakt_lista i rum"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Utseende"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Beteende"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Starta chattar i:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Chatt_ema:"
+msgid "new ta_bs"
+msgstr "nya fl_ikar"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Inaktivera notifieringar under fr_ånvaro eller upptagen"
+msgid "new _windows"
+msgstr "nya _fönster"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Inaktivera ljud under fr_ånvaro eller upptagen"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Visa inkommande händelser i notifieringsytan"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "Anslut _automatiskt vid uppstart"
+
 #: ../src/empathy-preferences.ui.h:9
-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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
-msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
+msgid "Log conversations"
+msgstr "Logga samtal"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Aktivera notifieringar när en kontakt ansluter"
+msgid "Behavior"
+msgstr "Beteende"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Aktivera notifieringar när en kontakt kopplar från"
+msgid "General"
+msgstr "Allmänt"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
+msgid "_Enable bubble notifications"
+msgstr "_Aktivera bubbelnotifieringar"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Aktivera rättstavning för språk:"
+msgid "Disable notifications when _away or busy"
+msgstr "Inaktivera notifieringar under fr_ånvaro eller upptagen"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Allmänt"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Aktivera notifieringar när _chatten inte är fokuserad"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Aktivera notifieringar när en kontakt ansluter"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Platskällor:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Aktivera notifieringar när en kontakt kopplar från"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Logga samtal"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Notifieringar"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Aktivera ljudnotifieringar"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Spela upp ljud för händelser"
+msgid "Disable sounds when _away or busy"
+msgstr "Inaktivera ljud under fr_ånvaro eller upptagen"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Integritet"
+msgid "Play sound for events"
+msgstr "Spela upp ljud för händelser"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid "Reduced location accuracy means that nothing more precise than your city, state and country will be published.  GPS coordinates will be accurate to 1 decimal place."
-msgstr "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
+msgid "Sounds"
+msgstr "Ljud"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Visa _smilisar som bilder"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Använd _ekosläckning för att förbättra samtalskvaliteten"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Visa kontakt_lista i rum"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "Ljud"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Stavningskontroll"
+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 hear strange noises or glitches during calls, try turning echo cancellation off and restarting the call."
+msgstr "Ekosläckning hjälper till att göra din röst klarare för den andra personen, men kan orsaka problem på vissa datorer. Om du eller den andra personen hör konstiga oljud eller avbrott under samtal, prova att stänga av ekosläckning och börja om samtalet."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "The list of languages reflects only the languages for which you have a dictionary installed."
-msgstr "Listan visar endast språk som du har en ordlista installerad för."
+msgid "_Publish location to my contacts"
+msgstr "_Publicera platsen till mina kontakter"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Teman"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr ""
+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 "Minskad precision för platsen betyder att ingenting mer informativt än din stad, län och land kommer att publiceras. GPS-koordinater kommer endast att använda en decimal."
 
+#. 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 "Variant:"
-msgstr "Variant:"
+msgid "_Reduce location accuracy"
+msgstr "_Minska precision för plats"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "Anslut _automatiskt vid uppstart"
+msgid "Privacy"
+msgstr "Integritet"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Mobiltelefon"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Aktivera bubbelnotifieringar"
+msgid "_Cellphone"
+msgstr "_Mobiltelefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Aktivera ljudnotifieringar"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Nätverk (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Platskällor:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Öppna nya chattar i separata fönster"
+msgid "The list of languages reflects only the languages for which you have a dictionary installed."
+msgstr "Listan visar endast språk som du har en ordlista installerad för."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Publicera platsen till mina kontakter"
+msgid "Enable spell checking for languages:"
+msgstr "Aktivera rättstavning för språk:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Stavningskontroll"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "_Minska precision för plats"
+msgid "Chat Th_eme:"
+msgstr "Chatt_ema:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Variant:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teman"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Status"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Ring upp kontakten igen"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Kamera av"
+msgid "Redial"
+msgstr "Ring igen"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Kamera på"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Video av"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Inaktivera kamera och stoppa videoöverföringen"
+msgid "Video Preview"
+msgstr "Videoförhandsvisning"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Aktivera kamera och överför video"
+msgid "Video On"
+msgstr "Video på"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Aktivera kameran med överför ingen video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Ring upp kontakten igen"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Förhandsvisning"
+msgid "Camera Off"
+msgstr "Kamera av"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ring igen"
+msgid "Disable camera and stop sending video"
+msgstr "Inaktivera kamera och stoppa videoöverföringen"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Förhandsvisning"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Video av"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Aktivera kameran med överför ingen video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Video på"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Kamera på"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Videoförhandsvisning"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Aktivera kamera och överför video"
 
 #: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Kartvy för kontakter"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1585
 msgid "Save"
 msgstr "Spara"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1761
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1848
 msgid "Pause"
 msgstr "Gör paus"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:1860
 msgid "Level "
 msgstr "Nivå "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:1879
 msgid "Debug"
 msgstr "Felsökning"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:1884
 msgid "Info"
 msgstr "Info"
 
-#: ../src/empathy-debug-window.c:1561
-#: ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:1889
+#: ../src/empathy-debug-window.c:1935
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:1894
 msgid "Warning"
 msgstr "Varning"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:1899
 msgid "Critical"
 msgstr "Kritiskt"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:1904
 msgid "Error"
 msgstr "Fel"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:1923
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1926
 msgid "Domain"
 msgstr "Domän"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:1928
 msgid "Category"
 msgstr "Kategori"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:1930
 msgid "Level"
 msgstr "Nivå"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:1953
 msgid "The selected connection manager does not support the remote debugging extension."
 msgstr "Den valda anslutningshanteraren saknar stöd för tillägg för fjärrfelsökning."
 
@@ -4410,31 +4322,27 @@ msgstr "Välj en kontakt att bjuda in till samtalet:"
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "Visa inte några dialogrutor; gör valfri åtgärd (t.ex, importera) och avsluta"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "Visa inte några dialogrutor såvida inte det endast finns \"Personer i närheten\"-konton"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "Välj initiallt angivet konto (t.ex., gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<konto-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Visa kontoguiden"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy-konton"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy-konton"
 
@@ -4450,7 +4358,7 @@ msgstr "- Empathy-felsökare"
 msgid "Empathy Debugger"
 msgstr "Empathy-felsökare"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy chattklient"
 
@@ -4459,13 +4367,13 @@ msgid "Respond"
 msgstr "Svara"
 
 #: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-call-window.c:1572
 msgid "Reject"
 msgstr "Avvisa"
 
 #: ../src/empathy-notifications-approver.c:209
 #: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-call-window.c:1573
 msgid "Answer"
 msgstr "Svara"
 
@@ -4497,39 +4405,39 @@ msgstr "%s försökte just ringa dig men du var upptagen i ett annat samtal."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172
-#: ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1179
+#: ../src/empathy-call-window.c:1202
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2936
 msgid "On hold"
 msgstr "Väntar"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2939
 msgid "Mute"
 msgstr "Tyst"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2941
 msgid "Duration"
 msgstr "Längd"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2944
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3214
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Ditt aktuella saldo är %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3218
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr ""
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3220
 msgid "Top Up"
 msgstr "Fyll på"
 
@@ -4537,10 +4445,187 @@ msgstr "Fyll på"
 msgid "_Match case"
 msgstr "_Matcha skiftläge"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Vilken typ av chattkonto har du?"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "Lägger till nytt konto"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Personer i närheten"
+
+#: ../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."
+msgstr "Empathy kan automatiskt upptäcka och chatta med personer som är anslutna på samma nätverk som du är. Om du vill använda denna funktion så kontrollera att uppgifterna nedan är korrekta."
+
+#: ../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 ""
+
+#~ msgid "Personal Information"
+#~ msgstr "Personlig information"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Länkade kontakter"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Välj kontakter att länka"
+
+#~ msgid "New contact preview"
+#~ msgstr "Förhandsvisa ny kontakt"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Kontakter markerade i listan till vänster kommer att länkas ihop."
+#~ msgctxt "Link individual (contextual menu)"
+
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Länka kontakter..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "Länka kontakter"
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink…"
+#~ msgstr "A_vlänka..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Dela helt upp den visade länkade kontakten till separata kontakter."
+
+#~ msgid "_Link"
+#~ msgstr "_Länka"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Avlänka länkade kontakter \"%s\"?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Är du säker på att du vill avlänka dessa länkade kontakter? Detta kommer "
+#~ "helt att dela upp de länkade kontakterna till separata kontakter."
+#~ msgctxt "Unlink individual (button)"
+
+#~ msgid "_Unlink"
+#~ msgstr "Av_länka"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Det inträffade ett fel när konton importerades."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Det inträffade ett fel vid tolkning av kontouppgifterna."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Det inträffade ett fel när kontot skapades."
+
+#~ msgid "There was an error."
+#~ msgstr "Det inträffade ett fel."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Felmeddelandet var: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Du kan antingen gå tillbaka och försöka att ange dina kontouppgifter igen "
+#~ "eller avsluta denna guide och lägga till konton senare från Redigera-"
+#~ "menyn."
+
+#~ msgid "An error occurred"
+#~ msgstr "Ett fel inträffade"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "Har du ytterligare chattkonton som du vill konfigurera?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Ange dina kontouppgifter"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Vilken typ av chattkonto vill du skapa?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Vill du skapa andra chattkonton?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Ange uppgifterna för det nya kontot"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Med Empathy kan du chatta med anslutna personer i närheten och med vänner "
+#~ "och kollegor som använder Google Talk, AIM, Windows Live och många andra "
+#~ "chattprogram. Du kan även använda ljud- och videosamtal om du har en "
+#~ "mikrofon eller webbkamera."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "Har du ett konto som du har använt med andra chattprogram?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Ja, importera mina kontouppgifter från "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Ja, jag vill ange mina kontouppgifter nu"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Nej, jag vill ha ett nytt konto"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Nej, jag vill bara se anslutna personer i närheten just nu"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Välj de konton som du vill importera:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Nej, det är allt för stunden"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Redigera->Konton"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Jag vill _inte aktivera denna funktion just nu"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Du kommer inte att kunna chatta med personer som är anslutna till ditt "
+#~ "lokala nätverk eftersom telepathy-salut inte är installerat. Om du vill "
+#~ "aktivera denna funktion så installera paketet telepathy-salut och skapa "
+#~ "ett Personer i närheten-konto från Konto-dialogrutan"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Guide för meddelanden och VoIP-konton"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Välkommen till Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Importera dina befintliga konton"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Ange personlig information"
+
+#~ msgid "Protocol:"
+#~ msgstr "Protokoll:"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Personlig information"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Öppna nya chattar i separata fönster"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Visa kontoguiden"
+
 #~ msgid "Call volume"
 #~ msgstr "Samtalsvolym"
 
@@ -5283,9 +5368,6 @@ msgstr "Lägger till nytt konto"
 #~ msgid "gtk-quit"
 #~ msgstr "Avsluta"
 
-#~ msgid "ICQ account settings"
-#~ msgstr "Inställningar för ICQ-konto"
-
 #~ msgid "jabber account settings"
 #~ msgstr "inställningar för jabberkonto"
 
@@ -5368,8 +5450,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "Snabbmeddelandeklient för Gnome"
 #~ msgid "-"
 #~ msgstr "-"
-#~ msgid "<b>Personal Details</b>"
-#~ msgstr "<b>Personliga detaljer</b>"
 #~ msgid "<b>Status</b>"
 #~ msgstr "<b>Status</b>"
 #~ msgid "<b>Subscription</b>"
@@ -5454,8 +5534,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "Använd systemets pro_xyinställningar"
 #~ msgid "_Birthday:"
 #~ msgstr "_Födelsedag:"
-#~ msgid "_Connect"
-#~ msgstr "An_slut"
 #~ msgid "_Deny"
 #~ msgstr "_Neka"
 #~ msgid "_Disconnect"
@@ -5647,8 +5725,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "Ett okänt fel inträffade under filöverföringen."
 #~ msgid "Someone would like to send you a file."
 #~ msgstr "Någon vill skicka en fil till dig."
-#~ msgid "Retry connection"
-#~ msgstr "Återanslut"
 #~ msgid "Invited %s to join this chat conference."
 #~ msgstr "Inbjöd %s till att gå med i chattkonferens."
 #~ msgid "%s has set the topic: %s"
@@ -5965,8 +6041,6 @@ msgstr "Lägger till nytt konto"
 #~ msgstr "<b>Utseende och beteende</b>"
 #~ msgid "Check spelling while I _type"
 #~ msgstr "Kontrollera stavning medan jag skriver"
-#~ msgid "Close this chat window"
-#~ msgstr "Stäng detta chattfönster"
 #~ msgid "Requested Information"
 #~ msgstr "Information efterfrågad"
 #~ msgid "Requested information."
diff --git a/po/ta.po b/po/ta.po
index e547c70d8..8bd03cd10 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -4,15 +4,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Dr.T.vasudevan <agnihot3@gmail.com>, 2009.
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2009, 2010, 2011.
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2009, 2010, 2011, 2012.
 # I. Felix <ifelix@redhat.com>, 2009.
 # Dr,T,Vasudevan <agnihot3@gmail.com>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-18 13:57+0530\n"
-"PO-Revision-Date: 2011-09-18 13:59+0530\n"
+"POT-Creation-Date: 2012-02-26 12:33+0530\n"
+"PO-Revision-Date: 2012-02-26 12:36+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "Language: ta\n"
@@ -44,79 +44,85 @@ msgstr "எம்பதி இணைய செய்தியாளர் "
 msgid "IM Client"
 msgstr "ஐ எம் சார்ந்தோன்"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "செய்தி அனுப்புதல் மற்றும் வோய்ப் கணக்குகள் ஐ  மேலாளவும் "
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "செய்தி அனுப்புதல் மற்றும் வோய்ப் கணக்குகள்"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "எப்போதும் புதிய அரட்டைக்கு புதிய சாளரம் திற"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "அழைப்பு ஒலி அளவு"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "அழைப்பு ஒலி அளவு, சதவிகிதமாக."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid "Camera device"
 msgstr "கேமரா சாதனம்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Camera position"
 msgstr "கேமரா நிலை"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "குழு அரட்டையில் செல்லப்பெயர் கீற்றில் செல்லப்பெயருக்குப்பின் சேர்க்க வேண்டிய எழுத்துரு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Chat window theme"
 msgstr "அரட்டை சாளர கருத்து"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Chat window theme variant"
 msgstr "அரட்டை சாளர மாற்று கருத்து"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
 "சொல் திருத்தி மொழிகளை பயன்படுத்த காற் புள்ளியால் பிரித்த பட்டியல் (எ-டு.  \"en, fr, nl "
 "\")"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Compact contact list"
 msgstr "அடக்கமான தொடர்பு பட்டியல்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Connection managers should be used"
 msgstr "இணைப்பு மேலாளரை பயன்படுத்த வேண்டும்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Contact list sort criterion"
 msgstr "தொடர்பு பட்டியல் வரிசைப்படுத்த கட்டளை விதி"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "ஒரு அறையில் சேர கடைசியாக தேர்ந்தெடுத்த கணக்கின் டி-பஸ் பொருள் பாதை"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "விடியோ அழைப்புகளுக்கு முன்னிருப்பு கேமரா சாதனம். எ-கா. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Default directory to select an avatar image from"
 msgstr "அவதாரம் படம் தேந்தெடுக்க முன்னிருப்பு அடைவு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Disable popup notifications when away"
 msgstr "வெளியே உள்ள போது துள்ளு அறிவிப்புகளை செயல் நீக்குக"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable sounds when away"
 msgstr "வெளியே உள்ள போது ஒலியை செயல் நீக்குக"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Display incoming events in the status area"
 msgstr "உள்வரும் நிகழ்ச்சிகளை நிலைப்பலக இடத்தில் காட்டுக."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -124,70 +130,74 @@ msgstr ""
 "உள்வரும் நிகழ்ச்சிகளை நிலை அறிவிப்பு இடத்தில் காட்டுக. இல்லை என அமைந்தால் பயனருக்கு உடனே "
 "காட்டுக."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Echo cancellation support"
 msgstr "எதிரொலி நீக்கி ஆதரவு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy can publish the user's location"
 msgstr "பயனரின் இடத்தை தொடர்புகளுக்கு எம்பதியால் காட்ட இயலும்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can use the GPS to guess the location"
 msgstr "எம்பதியால் பயனரின் இடத்தை ஊகிக்க ஜிபிஎஸ் ஐ  பயன்படுத்த இயலும்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "எம்பதியால் பயனரின் இடத்தை ஊகிக்க அலைபேசி வலையை  பயன்படுத்த இயலும்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the network to guess the location"
 msgstr "எம்பதியால் பயனரின் இடத்தை ஊகிக்க  வலையை பயன்படுத்த இயலும்"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy default download folder"
 msgstr "எம்பதி முன்னிருப்பு தரவிறக்க அடைவு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "எம்பதி பட்டர்ப்ளை லாக்ஸ் இலிருந்து இட மாற்றம் ஆகிவிட்டது"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy should auto-away when idle"
 msgstr "சும்மா இருக்கும் போது எம்பதி தானியங்கியாக வெளியே இருப்பதாக வேண்டும்."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy should auto-connect on startup"
 msgstr "துவங்கும் போது எம்பதி தானியங்கியாக இணைக்க வேண்டும்."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should reduce the location's accuracy"
 msgstr "துவங்கும் போது எம்பதி இடததின் குறிப்பை குறைக்க வேண்டும்."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "துவங்கும் போது எம்பதி அரட்டை சாரளத்தில்  சின்னமாக தொடர்பின் அவதாரத்தை காட்ட  வேண்டும்."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Enable WebKit Developer Tools"
 msgstr "வெப்கிட் உருவாக்குவோர் கருவிகளை செயல்படுத்து"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Enable popup notifications for new messages"
 msgstr "புதிய செய்திகளுக்கு துள்ளு அறிவிப்புகளை செயல்படுத்து "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable spell checker"
 msgstr "சொல் திருத்தியை செயல்படுத்து"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Hide main window"
 msgstr "முதன்மை சாளரத்தை மறை "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Hide the main window."
 msgstr "முதன்மை சாளரத்தை மறை "
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "மற்ற பயனர்களுக்கு அவர்களுக்காக தட்டச்சும் போது தெரிவிக்கவும்"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid "Last account selected in Join Room dialog"
+msgstr "அறையில் சேர் உரையாடலில் கடைசியாக தேர்ந்தெடுத்த கணக்கு"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "செல்லப்பெயரை பூர்த்தி செய்யும் எழுத்துரு"
@@ -257,81 +267,81 @@ msgid "Show avatars"
 msgstr "அவதாரங்களை காட்டு"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "தொடர்பு குழுக்கள காட்டு "
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "தொடர்பு பட்டியல் ஐ அறைகளில் காட்டு "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "முதன்மை சாளரத்தை மூடிவது குறித்து குறிப்பு காட்டு "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr " வலை தொடர்பில்லாத தொடர்புகளை காட்டு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "விதிமுறைகளை காட்டு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "எழுத்துப்பிழை திருத்த மொழி"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "இடமாற்றிய கோப்புகளை சேமிக்க முன்னிருப்பு அடைவு"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "அவதாரம் படம் தேர்ந்தெடுத்த கடைசி அடைவு "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "அரட்டை சாளரத்தின் பக்கப் பலக இடம் "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "அரட்டை பக்கப் பலகத்தின் சேமித்த இடம் (பிக்ஸல்களில்)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "அரட்டை சாளரங்களில் உரையாடல்களை காட்ட பயன்படும் கருத்து"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "அரட்டை சாளரங்களில் உரையாடல்களை காட்ட பயன்படும் மாற்று கருத்து"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "வரைகலை சிரிப்பான்களை பயன்படுத்துக"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "அறிவிப்பு ஒலிகளை பயன்படுத்துக"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "அரட்டை அறைகளுக்கு கருத்துக்களை பயன்படுத்துக"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "பயனரின் இடத்தை தொடர்புகளுக்கு எம்பதி காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "எம்பதி பயனரின் இடத்தை ஊகிக்க ஜிபிஎஸ் ஐ பயன்படுத்தலாமா இல்லையா."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "எம்பதி பயனரின் இடத்தை ஊகிக்க அலைபேசி வலையை பயன்படுத்தலாமா இல்லையா."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "எம்பதி பயனரின் இடத்தை ஊகிக்க  வலையை பயன்படுத்தலாமா இல்லையா."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "எம்பதி பட்டர்ப்ளை லாக்ஸ் இலிருந்து இட மாற்றம் ஆகிவிட்டதா? "
-
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "எம்பதி துவங்கும்போது கணக்குகளில் தானியங்கியாக உள்நுழைய வேண்டுமா இல்லையா."
@@ -344,7 +354,8 @@ msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "அந்தரங்கத்தை காப்பாற்ற துவங்கும் போது எம்பதி இடத்தின் குறிப்பை குறைக்க வேண்டுமா இல்லையா"
+msgstr ""
+"அந்தரங்கத்தை காப்பாற்ற துவங்கும் போது எம்பதி இடத்தின் குறிப்பை குறைக்க வேண்டுமா இல்லையா"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
@@ -409,14 +420,22 @@ msgid "Whether to play sound notifications when away or busy."
 msgstr "வெளியே அல்லது வேலையாக உள்ள போது ஒலி அறிக்கைகளை இயக்க வேண்டுமா இல்லையா?"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"'உருவாக்கம் ' அல்லது 'இடைநிறுத்தம்' அரட்டை நிலைகளை அனுப்பவா. இது நடப்பு 'போயாயிற்று' "
+"நிலையை பாதிக்காது."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "தொடர்பு இணைப்பு விலகி செல்கையில்  துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "தொடர்பு இணைப்பில் வருகையில்  துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
@@ -424,39 +443,43 @@ msgstr ""
 "புதிய செய்தி ஒன்று வரும்போது அரட்டை திறந்து இருந்து குவிப்பில் இல்லாவிட்டாலும் துள்ளு "
 "அறிக்கையை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "புதிய செய்தி ஒன்று வரும்போது  துள்ளு அறிக்கையை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr " தொடர்பு பட்டியலில் கணக்கு மீதியை  காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "அரட்டை பட்டியலிலும் தொடர்பு பட்டியலிலும் அவதாரங்களை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "தொடர்பு பட்டியலிலும் இணைப்பில் இல்லாத தொடர்புகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr " தொடர்பு பட்டியலில் குழுக்களை காட்ட வேண்டுமா இல்லையா?"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "வெளியே அல்லது வேலையாக உள்ள போது துள்ளு அறிக்கைகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr " தொடர்பு பட்டியலில் விதிமுறைகளை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "அரட்டை அறையில் தொடர்பு பட்டியலை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "அடக்கப்பாங்கில் தொடர்பு பட்டியலை காட்ட வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -464,47 +487,65 @@ msgstr ""
 "தலைப்பு பட்டியில் x பொத்தானால் முதன்மை சாளரத்தை மூடுவதை குறித்த உரையாடலை காட்ட "
 "வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "அரட்டை அறைகளில் கருத்துக்களை பயன்படுத்த வேண்டுமா இல்லையா?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
 "தொடர்பு பட்டியல் ஐ வரிசைப்படுத்தும் போது பயன்படுத்த நிபந்தனைகள். முன்னிருப்பு   தொடர்பு "
-"பெயர் மதிப்பு \"பெயர்\". \"நிலை\" என்ற மதிப்பு தொடர்பை நிலையை பொருத்து "
+"நிலை மதிப்பு \"நிலை\". \"பெயர்\" என்ற மதிப்பு தொடர்பின் பெயரை பொருத்து "
 "வரிசைப்படுத்தும்."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "செய்தி அனுப்புதல் மற்றும் வோய்ப் கணக்குகள் ஐ  மேலாளவும் "
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "காரணம் குறிப்பிடவில்லை"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "செய்தி அனுப்புதல் மற்றும் வோய்ப் கணக்குகள்"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "நிலையில் மாற்றம் வேண்டப்பட்டது"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "நீங்கள் கோப்பு பரி மாற்றத்தை ரத்து செய்தீர்கள்"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "மற்ற பங்குதாரர் கோப்பு பரி மாற்றத்தை ரத்து செய்தார்."
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "கோப்பு பரி மாற்றத்தில்  பிழை "
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "மற்ற பங்குதாரர் கோப்பு பரி மாற்றத்தை செய்ய முடியவில்லை."
+
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "தெரியாத காரணம்"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "கோப்பு பறிமாற்றம் முடிந்தது ஆனால் கோப்பு சிதைந்தது. "
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "கோப்பு பறிமாற்றத்துக்கு தொலை தொலைதொடர்பில் ஆதரவில்லை"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "தேர்ந்தெடுத்த கோப்பு வழக்கமான கோப்பு அல்ல"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "தேர்ந்தெடுத்த கோப்பு காலியாக உள்ளது"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s இடமிருந்து தவறிய அழைப்பு"
@@ -520,168 +561,137 @@ msgstr "%s  அழைக்கப்பட்டார் "
 msgid "Call from %s"
 msgstr "%s இடமிருந்து அழைப்பு"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "சொருகி வாய் வகை க்கு ஆதரவில்லை"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "காரணம் குறிப்பிடவில்லை"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "நிலையில் மாற்றம் வேண்டப்பட்டது"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "நீங்கள் கோப்பு பரி மாற்றத்தை ரத்து செய்தீர்கள்"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "மற்ற பங்குதாரர் கோப்பு பரி மாற்றத்தை ரத்து செய்தார்."
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "கோப்பு பரி மாற்றத்தில்  பிழை "
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "மற்ற பங்குதாரர் கோப்பு பரி மாற்றத்தை செய்ய முடியவில்லை."
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:302
-msgid "Unknown reason"
-msgstr "தெரியாத காரணம்"
-
-#: ../libempathy/empathy-utils.c:222
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "இருப்பவை"
 
-#: ../libempathy/empathy-utils.c:224
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "வேலையில்"
 
-#: ../libempathy/empathy-utils.c:227
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "வெளியில்"
 
-#: ../libempathy/empathy-utils.c:229
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "மறைந்து"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "இணைப்பு விலகி"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "காரணம் குறிப்பிடவில்லை"
 
-#: ../libempathy/empathy-utils.c:276 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "நிலை இப்போது இணைப்பு விலகி "
 
-#: ../libempathy/empathy-utils.c:278 ../libempathy/empathy-utils.c:312
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "வலையமைப்பு பிழை"
 
-#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "உறுதி செய்தல் தோல்வி"
 
-#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "மறையாக்க பிழை"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "பயனில் உள்ள பெயர் "
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:318
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "சான்றிதழ் தரப்படவில்லை"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:320
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "சான்றிதழில் நம்பக தன்மை இல்லை"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "சான்றிதழ் காலாவதியானது"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "சான்றிதழ் செயல்படுத்தப்படவில்லை"
 
-#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "சான்றிதழ் புரவலன் பெயர் ஒத்திசையவில்லை"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "சான்றிதழ் அடையாளம் ஒத்திசையவில்லை"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "சான்றிதழ் தானே கையெழுத்திட்டது"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "சான்றிதழ் பிழை"
 
-#: ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "குறீயீட்டுமுறை கிடைப்பில் இல்லை"
 
-#: ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "சான்றிதழ் செல்லுபடியாகாது"
 
-#: ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "இணைப்பு மறுக்கப்பட்டது"
 
-#: ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "இணைக்க முடியவில்லை"
 
-#: ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "இணைப்பு அற்றுப்போயிற்று"
 
-#: ../libempathy/empathy-utils.c:344
-msgid "This resource is already connected to the server"
-msgstr "இந்த மூலம் ஏற்கனவே சேவையகத்துக்கு இணைக்கப்பட்டது"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "இந்த கணக்கு ஏற்கனவே சேவையகத்துக்கு இணைக்கப்பட்டது"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:357
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "இணைப்பு அதே முலத்துடன் புதிய இணைப்பால் மாற்றப்பட்டது."
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "இந்த கணக்கு ஏற்கனவே சேவையகத்தில் உள்ளது"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "இணைப்பை கையாள சேவையகம் இப்போது மிகவும் வேலை பளுவில் உள்ளது."
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "சான்றிதழ் ரத்து செய்யப்பட்டது"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:366
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "சான்றிதழ் பாதுகாப்பில்லாத சைபர் அல்கோரிதத்தை பயன்படுத்துகிறது. இது மறையாக்கத்தில் "
 "பலகீனமானது."
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -689,165 +699,144 @@ msgstr ""
 "சேவயகத்தின் சான்றிதழின் நீளம் அல்லது சங்கிலியின் ஆழம் மறையாக்க நூலகம் வரயறுத்த மதிப்பை "
 "தாண்டியது."
 
-#: ../libempathy/empathy-utils.c:519
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "உங்கள் மென்பொருள் மிகவும் பழையது"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "உள்ளார்ந்த பிழை"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "அருகில் உள்ள மக்கள்"
 
-#: ../libempathy/empathy-utils.c:524
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "யாஹூ! ஜப்பான்"
 
-#: ../libempathy/empathy-utils.c:553
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "கூகுள் டாக் "
 
-#: ../libempathy/empathy-utils.c:554
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook அரட்டை"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d வினாடி முன்"
 msgstr[1] "%d வினாடிகள் முன்"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d நிமிடம் முன்"
 msgstr[1] "%d நிமிடங்கள் முன்"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d மணி முன்"
 msgstr[1] "%d மணிகள் முன்"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d நாள் முன்"
 msgstr[1] "%d நாட்கள் முன்"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d வாரம் முன்"
 msgstr[1] "%d வாரங்கள் முன்"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d மாதம் முன்"
 msgstr[1] "%d மாதங்கள் முன்"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "எதிர்காலத்தில்"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "அனைத்து கணக்குகள்"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "கணக்கு"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "சேவையகம்"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "துறை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../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:1192
-msgid "My Web Accounts"
-msgstr "என் வலை கணக்குகள் "
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s கணக்கு %s வழியாக திருத்தப்பட வேண்டும்."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s கணக்கை எம்பதிக்கு சேர்க்க்க இயலாது. "
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "என் வலை கணக்குகள் ஐ துவக்குக. "
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "%s ஐ திருத்து"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr " பயனர் பெயர்:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_p அமை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "(_o) உள்நுழை"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "இந்த கணக்கு ஏற்கனவே சேவையகத்தில் உள்ளது"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "சேவையகத்தில் ஒரு புதிய கணக்கை துவக்கு"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "_n ரத்துசெய்க"
-
 #. 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:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s மீது  %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s கணக்கு"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "புதிய கணக்கு"
 
@@ -895,7 +884,7 @@ msgstr "கடவுச்சொல்லை நினைவு கொள்ள�
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
 msgid "Remember password"
 msgstr "கடவுச்சொல்லை நினைவு கொள்ளவும்"
 
@@ -1220,7 +1209,7 @@ msgid "STUN Server:"
 msgstr "ஸ்டன் சேவையகம்:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
 msgid "Server:"
 msgstr "சேவையகம்:"
 
@@ -1301,61 +1290,65 @@ msgstr "அனைத்து கோப்புகள்"
 msgid "Click to enlarge"
 msgstr "பெரியதாக்க சொடுக்குக"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "அழைப்பை துவக்கும் போது ஒரு பிழை."
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "குறிப்பிட்ட தொடர்பு அழைப்புகளை ஆதரிக்கவில்லை"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "குறிப்பிட்ட தொடர்பாளர் இணைப்பு விலகி உள்ளார்"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "குறிப்பிட்ட தொடர்பு செல்லுபடி ஆகாது."
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "இந்த நெறிமுறையில் அவசர அழைப்புகளுக்கு ஆதரவில்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:702
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "இந்த அழைப்பை செய்ய உங்கள் கணக்கில் போதிய பணம் இல்லை"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "அந்தரங்க அரட்டை திறக்கும் போது தோல்வி "
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "இந்த உரையாடலில் இந்த தலைப்புக்கு ஆதரவில்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "தலைப்பை மாற்ற அனுமதி உங்களுக்கில்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s”  செல்லுபடியாகாத தொடர்பு ஐடி"
 
-#: ../libempathy-gtk/empathy-chat.c:1058
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: நடப்பு உரையாடலில் இருந்து எல்லா செய்திகளையும் துடைக்கவும்"
 
-#: ../libempathy-gtk/empathy-chat.c:1061
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: நடப்பு உரையாடலுக்கு தலைப்பை அமைக்கவும்"
 
-#: ../libempathy-gtk/empathy-chat.c:1064
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: புதிய அரட்டை அறைக்கு சேரவும்."
 
-#: ../libempathy-gtk/empathy-chat.c:1067
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: புதிய அரட்டை அறைக்கு சேரவும்."
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
@@ -1363,23 +1356,23 @@ msgstr ""
 "/part [<chat room ID>] [<reason>]: அரட்டை அறையில் இருந்து வெளியேறுக, "
 "முன்னிருப்பாகநடப்பு அறை"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: அந்தரங்க அரட்டையை துவக்கவும்"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: அந்தரங்க அரட்டையை துவக்கவும்"
 
-#: ../libempathy-gtk/empathy-chat.c:1081
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: தற்போதைய சேவயகத்தில் உங்கள் செல்லபெயரை மாற்றவும்"
 
-#: ../libempathy-gtk/empathy-chat.c:1084
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: நடப்பு உரையாடலில் ஆக்ஷன் செய்தி ஒன்று அனுப்புக"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1388,11 +1381,11 @@ msgstr ""
 "/say <message>: send <message> நடப்பு உரையாடலுக்கு. இது '/' உடன் துவங்கும் "
 "செய்தியை அனுப்பப்பயன்படும்.உதாரணமாக: \"/say /join புதிய அரட்டை அறையில் சேர உதவும்.\""
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>:  ஒரு தொடர்பு குறித்த தகவலை காட்டுக"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1400,113 +1393,126 @@ msgstr ""
 "/help [<command>]: அனைத்து ஆதரவுள்ள கட்டளைகளையும் காட்டுக. <command> ஐ அறுதி இட்டு "
 "இருப்பின் பயனை காட்டுக."
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "பயன்பாடு: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1157
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "தெரியாத கட்டளை"
 
-#: ../libempathy-gtk/empathy-chat.c:1283
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "தெரியாத கட்டளை. ஆதரவுள்ள கட்டளைகளுக்கு /help ஐ பார்க்கவும்"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1453
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "செய்தி அனுப்ப போதுமான கட்டண மீதம்  இல்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "செய்தி '%s' அனுப்புவதில் பிழை: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "செய்தி  அனுப்புவதில் பிழை: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "செய்தி அனுப்ப போதுமான கட்டண மீதம்  இல்லை. <a href='%s'>கட்டணமளி</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "இயலாது "
 
-#: ../libempathy-gtk/empathy-chat.c:1462
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "இணைப்பு விலகி "
 
-#: ../libempathy-gtk/empathy-chat.c:1465
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "செல்லுபடியாகாத தொடர்பு"
 
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "அனுமதி மறுக்கப்பட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:1471
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "மிக நீள செய்தி"
 
-#: ../libempathy-gtk/empathy-chat.c:1474
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "அமுலாக்கவில்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:1478
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "தெரியாத"
 
-#: ../libempathy-gtk/empathy-chat.c:1484
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "செய்தி '%s' அனுப்புவதில் பிழை: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1488
-#, c-format
-msgid "Error sending message: %s"
-msgstr "செய்தி  அனுப்புவதில் பிழை: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1549 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "தலைப்பு:"
 
-#: ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "தலைப்பு இதற்கு அமை: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "தலைப்பு  %s ஆல் இதற்கு அமைக்கப்பட்டது: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "தலைப்பு ஏதும் வரையறுக்கப்படவில்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:2072
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(பரிந்துரைகள் இல்லை )"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2140
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr " '%s' ஐ  அகராதிக்கு சேர்"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2177
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr " '%s' ஐ %s அகராதிக்கு சேர்"
 
-#: ../libempathy-gtk/empathy-chat.c:2247
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "சிரிப்பானை சொருகு"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2265
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "அனுப்பு (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "_S எழுத்தாக்க பரிந்துரைகள் "
 
-#: ../libempathy-gtk/empathy-chat.c:2408
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "சமீபத்திய பதிவேட்டு உள்ளீடுகளை  மீட்கும் போது தோல்வி "
 
-#: ../libempathy-gtk/empathy-chat.c:2545
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s தொடர்பை துண்டித்தார்"
@@ -1514,12 +1520,12 @@ msgstr "%s தொடர்பை துண்டித்தார்"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2552
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s %2$sஆல் உதைக்கப்பட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:2555
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s உதைத்து வெளியேற்றப்பட்டார்"
@@ -1527,17 +1533,17 @@ msgstr "%s உதைத்து வெளியேற்றப்பட்ட�
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2563
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s %2$sஆல் தடை செய்யப்பட்டார்"
 
-#: ../libempathy-gtk/empathy-chat.c:2566
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s தடை செய்யப்பட்டார்"
 
-#: ../libempathy-gtk/empathy-chat.c:2570
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s அறையில் இருந்து வெளியேறினார்"
@@ -1547,17 +1553,17 @@ msgstr "%s அறையில் இருந்து வெளியேறி�
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2579
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2604
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s அறையில் சேர்ந்தார்"
 
-#: ../libempathy-gtk/empathy-chat.c:2629
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s இப்போது %s ஆனார்"
@@ -1565,88 +1571,87 @@ msgstr "%s இப்போது %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:2768
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1391
-#: ../src/empathy-call-window.c:1441 ../src/empathy-call-window.c:2479
+#: ../libempathy-gtk/empathy-chat.c:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "துண்டிக்கபட்டது"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3415
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "இந்த கடவுச்சொல்லை நினைவு கொள்ள வேண்டுமா?"
 
-#: ../libempathy-gtk/empathy-chat.c:3421
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "நினைவு கொள்ளவும்"
 
-#: ../libempathy-gtk/empathy-chat.c:3431
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "இப்போது இல்லை"
 
-#: ../libempathy-gtk/empathy-chat.c:3475
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "மறு முயற்சி"
 
-#: ../libempathy-gtk/empathy-chat.c:3479
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "தவறான கடவுச்சொல். தயை செய்து மீண்டும் முயற்சிக்கவும்"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3609
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "இந்த அறை ஒரு கடவுச்சொல்லால் பாதுகாக்கப்பட்டுள்ளது."
 
-#: ../libempathy-gtk/empathy-chat.c:3636
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "இணை"
 
-#: ../libempathy-gtk/empathy-chat.c:3838 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
 msgstr "இணைக்கப்பட்டது"
 
-#: ../libempathy-gtk/empathy-chat.c:3893
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "உரையாடல்"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3898
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "தெரியாத அல்லது செல்லுபடியாகாத அடையாளம் காணி"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "தற்காலிகமாக தொடர்பு தடுப்பி கிடைப்பில் இல்லை."
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "தொடர்பு தடுப்பி கிடைப்பில் இல்லை"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "அனுமதி மறுக்கப்பட்டது"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "தொடர்பை தடுக்க முடியவில்லை"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "தடுக்கப்பட்ட தொடர்புகளை திருத்து"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
@@ -1658,62 +1663,53 @@ msgstr "தடுக்கப்பட்ட தொடர்புகள்"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "நீக்கவும் "
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
 #: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "இணைப்பு முகவரியை நகலெடு (_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
 #: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "இணைப்பினை திற (_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "தொடர்பின்  தகவல் ஐ திருத்து"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "தனிப்பட்ட தகவல்"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "புதிய தொடர்பு"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s ஐ தடுக்கவா?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
+#: ../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 "%s ஐ உங்களை தொடர்பு கொள்வதில் இருந்து நிச்சயம் தடுக்க வேண்டுமா?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "_B தடு"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
+#: ../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] "_R இந்த தொடர்பை வசைமொழியாளர் என அறிவிக்கவும்"
@@ -1731,349 +1727,268 @@ msgstr "சந்தா வேண்டுதல்"
 msgid "_Block User"
 msgstr "_B பயனரை தடுக்கவும்"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "குழுவில் சேர்க்காத "
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "பிடித்தமான நபர்கள் "
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "நீங்கள் நிச்சயம் குழு '%s' ஐ நீக்க விரும்புகிறீர்களா?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "குழுவை நீக்குதல்"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "நீக்கவும் (_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "நீங்கள் நிச்சயம் தொடர்பு '%s' ஐ நீக்க விரும்புகிறீர்களா?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "தொடர்பு ஐ நீக்குதல்"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "(_A) தொடர்பை  சேர்."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "தொடர்பை தடுக்கவும் (_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_C அரட்டை"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "(_A) ஒலி அழைப்பு"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "(_V) விடியோ அழைப்பு"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "(_P) முந்தைய உரையாடல்கள்"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "கோப்பு ஐ அனுப்புக"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "என் மேல்மேசையை பகிர்ந்து கொள்"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "பிடித்தமான"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "(_m) தகவல்"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "திருத்து (_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1283
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "இந்த அறைக்கு அழைப்பு"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1329
-msgid "_Invite to Chat Room"
-msgstr "_I அரட்டை அறைக்கு அழைப்பு"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "தொடர்புaகளை தேடுக"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "தேடு:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "(_A) தொடர்பை  சேர்."
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "பொருத்தம்  ஏதும் காணப்படவில்லை"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "உங்களை அறிமுகப்படுத்தும் செய்தி:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "நீங்கள் இணைப்பில் வரும் போது என்னை பாருங்கள், நன்றி!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ஒரு தொடர்பு ஐ தேர்வு செய்க"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "முழுப்பெயர்:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "தொலைபேசி எண்:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "மின்னஞ்சல் முகவரி:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "வலைத்தளம்:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "பிறந்தநாள்:"
-
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "கடைசியாக கண்டது:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "இங்கிருந்து இணைக்கப்பட்டது:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "வெளிச்செல் செய்தி:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ஓடைகள்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "நாட்டின் ஐஎஸ்ஓ குறி:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "நாடு:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "மாநிலம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "மாநகரம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "வட்டாரம்"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "அஞ்சல் குறி:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "தெரு:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "கட்டிடம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "தளம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "அறை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "உரை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "விவரணம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "யூஆர்ஐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "பிழையின்மை மட்டம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr " பிழை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "செங்குத்து பிழை (மீட்டர்கள்):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "கிடைமட்ட பிழை (மீட்டர்கள்):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "வேகம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "திசை கோணம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "ஏறும் வேகம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "கடைசியாக இற்றைப்படுத்தியது:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "தீர்கரேகை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "அட்சரேகை:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "குத்துயரம்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:15
 msgid "Location"
 msgstr "இடம்"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y  %R யூடுசி (UTC) இல்"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "அவதாரத்தை சேமி"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "அவதாரத்தை சேமிக்க முடியவில்லை"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "தனிப்பட்ட விவரங்கள்"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "தொடர்பு விவரங்கள்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "முழுப்பெயர்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "தொலைபேசி எண்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "மின்னஞ்சல் முகவரி"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "வலைத்தளம்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "பிறந்தநாள்"
+
+#. 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 "கடைசியாக கண்டது:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "இங்கிருந்து இணைக்கப்பட்டது:"
+
+#. 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 "வெளிச்செல் செய்தி:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "வேலை"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "இல்லம்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "அலைபேசி "
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "குரல்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "விருப்பங்கள்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "அஞ்சல்"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "பார்சல்"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>இடம்</b> (date) போது\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "புனைப்பெயர்:"
 
@@ -2085,15 +2000,10 @@ msgstr "சார்ந்தோன் தகவல்"
 msgid "Client:"
 msgstr "சார்ந்தோன்:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "தொடர்பு விவரங்கள்"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "இனங்காட்டி:"
 
@@ -2110,11 +2020,11 @@ msgstr "OS:"
 msgid "Version:"
 msgstr "பதிப்பு:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2122,105 +2032,167 @@ msgstr ""
 "இந்த தொடர்பு வர வேன்டிய குழுவை தேர்வு செய்க. நீங்கள் ஒன்றுக்கு மேற்பட்ட குழுக்களை தேர்வு "
 "செய்யலாம் அல்லது ஒன்றையும் தேர்வு செய்யாதிருக்கலாம்."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "குழுவை சேர் (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "தேர்வு செய்க "
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "குழு"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "கீழ் கண்ட அடையாளம் தடுக்கப்படும்:"
 msgstr[1] "கீழ் கண்ட அடையாளங்கள் தடுக்கப்படும்:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "கீழ் கண்ட அடையாளம் தடுக்கப்பட முடியவில்லை"
 msgstr[1] "கீழ் கண்ட அடையாளங்கள் தடுக்கப்பட முடியவில்லை"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "தொடுப்பில் உள்ள தொடர்புகள்"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "தொடுப்புக்கு தொடர்புகளை  ஐ தேர்வு செய்க"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "புதிய தொடர்பு முன் பார்வை"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "இடது பக்கம் உள்ள பட்டியலில் தெர்ந்தெடுத்த தொடர்புகள் ஒண்றாக இணைக்கப்படும்."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "தொடர்பின்  தகவல் ஐ திருத்து"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "அழைப்பை அமைக்க கணக்கை தேர்ந்தெடு"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "அழை"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "அலைபேசி "
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "வேலை"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "இல்லம்"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "தொடர்பை தடுக்கவும் (_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "_Chat"
+msgstr "_C அரட்டை"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_S எஸ்எம்எஸ்"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1141
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "(_A) ஒலி அழைப்பு"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "(_V) விடியோ அழைப்பு"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "_Previous Conversations"
+msgstr "(_P) முந்தைய உரையாடல்கள்"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "கோப்பு ஐ அனுப்புக"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "என் மேல்மேசையை பகிர்ந்து கொள்"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "பிடித்தமான"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "க்னோம்-தொடர்புகள் நிறுவப்படவில்லை"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "தொடர்பு விவரங்களுக்கு க்னோம் தொடர்புகளை நிறுவவும்."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "(_m) தகவல்"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "திருத்து (_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1167
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_L தொடர்புகள் ஐ தொடு..."
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "இந்த அறைக்கு அழைப்பு"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_I அரட்டை அறைக்கு அழைப்பு"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Add Contact…"
+msgstr "(_A) தொடர்பை  சேர்."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "_B நீக்கு மற்றும் தடு"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "நீங்கள் நிச்சயம் குழு '%s' ஐ நீக்க விரும்புகிறீர்களா?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "குழுவை நீக்குதல்"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "நீக்கவும் (_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "நீங்கள் நிச்சயம் தொடர்பு '%s' ஐ நீக்க விரும்புகிறீர்களா?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2229,7 +2201,11 @@ msgstr ""
 "நீங்கள் நிச்சயமாக சங்கிலித் தொடர்பு '%s' ஐ நீக்க விரும்புகிறீர்களா? இந்த தொடர்புடன்சங்கிலி "
 "போல் இணைந்த அனைத்து தொடர்புகளும் நீக்கப்படும் என் அறிக."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "தொடர்பு ஐ நீக்குதல்"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2244,19 +2220,19 @@ msgstr "<b>இடம்</b> (date) போது"
 msgid "Online from a phone or mobile device"
 msgstr "ஒரு தொலை பேசியில் இருந்தோ அல்லது அலை பேகியில் இருந்தோ இணைப்பில் தொடர்பு"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "புதிய வலையமைப்பு"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "ஒரு IRC வலைப்பின்னல் ஐ தேர்ந்தெடு"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "_N வலைப்பின்னல் பட்டியலை மீட்டமைக்கவும்"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "தேர்வு செய்க "
@@ -2269,177 +2245,135 @@ msgstr "புதிய சேவையகம்"
 msgid "SSL"
 msgstr "எஸ்எஸ்எல்"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "தொடர்புகள் ஐ தொடு"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_U தொடுப்பை விலக்கு..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid "Completely split the displayed linked contacts into the separate contacts."
-msgstr "காட்டப்பட்ட தொடர்புகளில்  உள்ள தொடர்புகளை தனிதனி தொடர்புகளாக முழுக்க பகிரவும்."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_L தொடுப்பு"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "தொடர்பு '%s' இன்  இணைப்புகளை நீக்கவா?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"நீங்கள் நிச்சயமாக இந்த சங்கிலி தொடர்பை நீக்க வேண்டுமா? இது இணைத்த தொடர்புகளை தனித்தனி "
-"தொடர்புகளாக முழுக்க பகிர்ந்துவிடும்."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_U இணைப்பை விலக்கு"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "வரலாறு"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "காட்டு"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "தேடு"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "%s இல் அரட்டை "
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s உடன் அரட்டை "
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s வினாடி"
 msgstr[1] "%s வினாடிகள்"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s நிமிடம்"
 msgstr[1] "%s நிமிடங்கள் "
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "அழைப்பு எடுத்துக்கொண்டது %s, முடிந்தது %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "இன்று"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "நேற்று"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3425
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "எப்போது வேண்டுமானாலும்"
 
 #: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2353
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "யார் வேண்டுமானாலும்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2666
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "யார்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2870
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "எப்போது"
 
-#: ../libempathy-gtk/empathy-log-window.c:2986
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "எது வேண்டுமானாலும்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2988
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "உரை அரட்டைகள்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2990
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "அழைப்புகள்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2995
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "உள்வரும் அழைப்புகள்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2996
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "வெளி செல்லும் அழைப்புகள்"
 
-#: ../libempathy-gtk/empathy-log-window.c:2997
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "தவறிய அழைப்புகள்"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "எது"
 
-#: ../libempathy-gtk/empathy-log-window.c:3728
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "முந்தைய உரையாடல்கள் பதிவுகள் அனைத்தையும் நிச்சயம் நீக்க வேண்டுமா?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3732
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "அனைத்தையும் துடை"
 
-#: ../libempathy-gtk/empathy-log-window.c:3739
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "இலிருந்து நீக்கு:"
 
@@ -2462,13 +2396,12 @@ msgstr "வரிவுரு"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "வீடியோ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
 #: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
+#: ../src/empathy-roster-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "திருத்து (_E)"
 
@@ -2480,36 +2413,82 @@ msgstr "கோப்பு (_F)"
 msgid "page 2"
 msgstr "பக்கம் 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "தொடர்பு ஐடி (ID):"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "தொடர்பாளர் இணைப்பு விலகி உள்ளார்"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "(_h) அரட்டை"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "குறிப்பிட்ட தொடர்பு செல்லுபடி ஆகாதது அல்லது தெரியாதது"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "இந்த தொடர்பு இந்த உரை வகை உரையாடலை ஆதரவில்லை"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "இந்த நெறிமுறையில் கேட்கப்பட்ட செயலம்சம் நடைமுறையாக்கவில்லை"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "கொடுத்த தொடர்புடன் ஒரு உரையாடலை துவக்க முடியவில்லை"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "இந்த ஓடையில் இருந்து நீங்கள் தடை செய்யப்பட்டீர்கள்"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "இந்த ஓடை நிரம்பியது"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "இந்த ஓடையில் சேர நீங்கள் அழைக்கப்பட வேண்டும்."
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "தொடர்பு துண்டிக்கப்பட்ட நிலையில் தொடர முடியாது"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "அனுமதி மறுக்கப்பட்டது"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "அழைப்பை துவக்கும் போது ஒரு பிழை நேர்ந்தது."
+
+#: ../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 "தொடர்பு அடையாளம் காணி அல்லது தொலைபேசி எண்ணை உள்ளிடுக:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "புதிய உரையாடல்"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "_V விடியோ அனுப்பு"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "_V விடியோ அழைப்பு"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "(_a) அழை"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "_A ஒலி அழைப்பு"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "புதிய அழைப்பு"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "<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"
@@ -2546,12 +2525,8 @@ msgstr "இந்த நிலை பிடித்த நிலையாக �
 msgid "Set status"
 msgstr "நிலையை அமை"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "உங்கள் நடப்பு நிலையையும் இருப்பையௌம் அமை "
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "தனிப்பயன் செய்திகள்"
 
@@ -2559,7 +2534,7 @@ msgstr "தனிப்பயன் செய்திகள்"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "புதிய %s கணக்கு"
@@ -2628,12 +2603,12 @@ msgstr "குரல் அழைப்பு முடிந்தது"
 msgid "Edit Custom Messages"
 msgstr "தனிப்பயன் செய்திகளை திருத்துக"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "செய்தி திருத்தப்பட்டது  %s இல் "
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "இயல்பான"
 
@@ -2708,41 +2683,45 @@ msgid "Certificate hostname: %s"
 msgstr "சான்றிதழ் புரவலன் பெயர்: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "தொடரவும்"
+msgid "C_ontinue"
+msgstr "_o தொடரவும்"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "நம்பிக்கை இல்லாத இணைப்பு"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "இந்த இணைப்பை நம்ப இயலாது. எப்படியும் தொடர வேண்டுமா?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "எஹிர்கால இணைப்புகளுக்கு இந்த தேர்வை நினைவில் இருத்தவும்"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "சான்றிதழ் விவரங்கள்"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "யூஆர்ஐ ஐ திறக்க முடியவில்லை"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "கோப்பை தேர்வு செய்"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "கோப்பை சேமிக்க போதுமான காலி இடம் இல்லை"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "இந்த கோப்பை சேமிக்க %s காலி இடம் தேவை, ஆனால் %s மட்டுமே கிடைக்கிறது"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s இடமிருந்து உள்வரும் கோப்பு"
@@ -2914,39 +2893,31 @@ msgstr "மேற்கு மொழி"
 msgid "Vietnamese"
 msgstr "வியட்னாம்"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "தேர்ந்தெடுக்கப்பட்ட தொடர்பாளர் கோப்புகளை பெற முடியாது"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "தேர்ந்தெடுக்கப்பட்ட தொடர்பாளர் இணைப்பு விலகி உள்ளார்"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "பிழை செய்தி இல்லை"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "உடனடி செய்தி (எம்பதி)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "துவங்கும்போது இணைக்க வேண்டாம்"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "துவங்கும்போது தொடர்பு பட்டியலையோ அல்லது வேறு உரையாடல்களோ காட்ட வேண்டாம்"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM கிளையன்"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr " கணக்கு மேலாளரை தொடர்பு கொள்வதில் பிழை"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2990,230 +2961,88 @@ msgstr ""
 "வேண்டும். இல்லையானால் கீழ் கண்ட முகவரிக்கு கடிதம் எழுதவும். Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "க்னோமுக்கு ஒரு உடனடி செய்தியாளர் சார்ந்தோன்."
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr "I. Felix <ifelix@redhat.com>. Dr. T. Vasudevan <agnihot3@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "கணக்குகளை இறக்கும் போது ஒரு பிழை."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "கணக்கு விவரங்களை பகுக்கும் போது ஒரு பிழை."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "கணக்கை உருவாக்கும் போது ஒரு பிழை."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "அங்கே ஒரு பிழையாக ஏற்பட்டது."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "பிழை செய்தி: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"நீங்கள் பின்னாலும் சென்று மற்றும் உங்களது கணக்குகளின் விவரங்களை மீண்டும் உள்ளிட முயற்சிக்கலாம் "
-"அல்லது இந்த வழிகாட்டியை நிறுத்தலாம் மற்றும் மெனுவை திருத்துவதிலுருந்து பின்னர் கணக்குகளை "
-"சேர்க்கலாம்."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "ஒரு பிழை ஏற்பட்டது"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "எந்த வகையான அரட்டை கணக்கை நீங்கள் பெற்றிருக்கிறீர்கள்?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "நீங்கள் அமைக்க விரும்புவதற்கு உங்களுக்கு ஏதேனும் மற்ற அரட்டை கணக்குகள் இருக்கிறதா?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "உங்களது கணக்கு விவரங்களை உள்ளிடவும்"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "எந்த வகையான அரட்டை கணக்கை நீங்கள் உருவாக்க விரும்புகிறீர்கள்?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "மற்ற அரட்டை கணக்குகளை உருவாக்க நீங்கள் விரும்புகிறீர்களா?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "புதிய கணக்கிற்கு விவரங்களை உள்ளிடவும்"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"எம்பதி (Empathy ) உடன் நீங்கள் ஆன்லைனில் அருகிலிருக்கும் மக்கள் மற்றும் நண்பர்கள் மற்றும் "
-"Google Talk, AIM, Windows Live போன்றவற்றை பயன்ற்றுபடுத்தி மற்றும் மற்ற பல அரட்டை "
-"நிரல்களில் இருக்கும் கொலிக்ஸ் உடன் அரட்டை அடிக்கலாம். மைக்ரோ போன் அல்லது வெப்கேமிராவினால் "
-"நீங்களும் ஆடியோ அல்லது வீடியோ அழைப்புகளை பெறலாம். "
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "மற்ற அரட்டை நிரலை பயன்படுத்திக் கொண்டிருக்கிற உங்களுக்கு ஒரு கணக்கு உள்ளதா?"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "ஆம், எனது கணக்கு விவரங்களை இதிலிருந்து இறக்கவும் "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "ஆம், இப்போது எனது கணக்கு விவரங்களை உள்ளிடுகிறேன்"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "இல்லை, எனக்கு ஒரு புதிய கணக்கு வேண்டும்"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "இல்லை, இப்போது ஆன்லைனில் எனக்கு அருகிலிருக்கும் மக்களை நான் பார்க்க விரும்புகிறேன்"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "நீங்கள் இறக்க விரும்பும் கணக்குகளை தேர்ந்தெடுக்கவும்:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "ஆம்"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "இல்லை, இப்போதைக்கு அவ்வளவு தான்"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"எம்பதியால் தானியங்கியாக உங்களைப்போலவே உள் வலையில் உள்ளோரை கண்டு பிடித்து அரட்டை அடிக்க "
-"இயலும். இந்த அம்சத்தை நீங்கள் செயலாக்க விரும்பினால் கீழ் கண்டுள்ள விவரங்களை சரி பார்க்கவும். "
-"கணக்கு உரையாடல் மூலம் நீங்கள் இந்த விவரங்களை சுலபமாக மாற்றலாம் அல்லது இந்த அம்சத்தை செயல் "
-"நீக்கலாம்."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr " திருத்துக->கணக்குகள்"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "_n இல்லை, இப்போது இந்த அம்சத்தை செயலாக்க விரும்பவில்லை"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"டெலிபதி-சலுட் நிறுவப்படவில்லை. அதனால் உள் வலையில் இணைந்துள்ள மக்களுடன் நீங்கள் அரட்டையடிக்க "
-"இயலாது. இந்த அம்சத்தை நீங்கள் செயலாக்க விரும்பினால் டெலிபதி-சலுட் நிறுவுங்கள். மேலும் "
-"கணக்கு உரையாடல் மூலம் அண்மையில் உள்ளோர் கணக்கு ஒன்று துவக்கவும். "
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "டெலிபதி-சலுட் நிறுவப்படவில்லை"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "செய்தி அனுப்புதல் மற்றும் வோய்ப் கணக்குகள் உதவியாளர்"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "எம்பதிக்கு வரவேற்பு"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "உங்களிடம் இருக்கிற கணக்குகளை இறக்கவும்"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "தயை செய்து சொந்த விவரங்களை உள்ளிடுக"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "சேமிக்கப்படாத மாற்றங்கள் உங்கள் %s கணக்கில் உள்ளன."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "உங்கள் கணக்கு இன்னும் சேமிக்கப்படவில்லை"
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1175
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "இணைக்கிறது"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "இணைப்பு விலகி — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "துண்டிக்கபட்டது — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "இணைப்பு விலகி — வலைப்பின்னல் இணைப்பு இல்லை"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "தெரியாத நிலை"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"இந்த கணக்கு பழைய ஆதரவில்லாத பின்புலத்தை சார்ந்து இருப்பதால் செயல் நீக்கப்பட்டது. இந்த கணக்கை "
+"இடம் மாற்ற டெலிபதி-ஹேஸ் ஐ நிறுவி அமர்வை மறு துவக்கம் செய்யவும்."
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "இணைப்பு விலகி —கணக்கு முடக்கப்பட்டது"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"நீங்கள் புதிய கணக்கை துவக்கப்போகிறீர்கள்!அது உங்கள் \n"
-"மாற்றங்களை விலக்கிவிடும். நிச்சயம் தொடர வேண்டுமா?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "இணைப்பு அளபுருபுகளை திருத்துக"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "சேவையகத்தில் இருந்து உங்கள் சொந்த தகவல்களை மீட்பது தோல்வியுற்றது."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "இணைப்பில் சென்று உங்கள் சொந்த தகவல்களை திருத்துக"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_E இணைப்பு அளவுருக்களை திருத்து..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "நீங்கள் நிச்சயம் குழு '%s' ஐ உங்கள் கணினியிலிருந்து நீக்க விரும்புகிறீர்களா?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "இது உங்கள் கணக்கை சேவையகத்தில் இருந்து நீக்காது"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3222,15 +3051,23 @@ msgstr ""
 "மாற்றங்களை விலக்கிவிடும். நிச்சயம் தொடர வேண்டுமா?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "செயல்படுத்து (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "செயல் நீக்கு (_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_S தவிர்"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_C இணைக்கப்பட்டது"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3247,14 +3084,10 @@ msgid "Loading account information"
 msgstr "கணக்கு தகவல் தகவல்கள் ஏற்றப்படுகின்றன"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "நெறிமுறைகள் ஏதும் நிறுவவில்லை"
-
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "விதிமுறை:"
+msgid "No protocol backends installed"
+msgstr "நெறிமுறை பின்புலங்கள் ஏதும் நிறுவவில்லை"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3262,214 +3095,23 @@ msgstr ""
 "ஒரு புதிய கணக்கு துவக்க ஒவ்வொரு நெறிமுறைக்கும் நீங்கள் முதலில் ஒரு பின்புலத்தை அமைக்க "
 "வேண்டும்."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "_I இறக்குமதி செய்"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr "- எம்பதி உறுதி செய்தல் சார்ந்தோன்"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "- எம்பதி உறுதி செய்தல் சார்ந்தோன்"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "அருகில் உள்ள மக்கள்"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
-msgid "- Empathy Audio/Video Client"
-msgstr "- எம்பதி கேட்பொலி/ வீடியோ சார்ந்தோன்"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
-msgid "Empathy Audio/Video Client"
-msgstr "எம்பதி கேட்பொலி/ வீடியோ சார்ந்தோன்"
-
-#: ../src/empathy-streamed-media-window.c:431
-msgid "Contrast"
-msgstr "வேறுபாடு"
-
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Brightness"
-msgstr "வெளிச்சம்"
-
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Gamma"
-msgstr "காமா"
-
-#: ../src/empathy-streamed-media-window.c:542
-msgid "Volume"
-msgstr "ஒலி அளவு"
-
-#: ../src/empathy-streamed-media-window.c:1110
-msgid "_Sidebar"
-msgstr "பக்கப்பட்டை(_S)"
-
-#: ../src/empathy-streamed-media-window.c:1130
-msgid "Audio input"
-msgstr "ஒலி உள்ளீடு"
-
-#: ../src/empathy-streamed-media-window.c:1134
-msgid "Video input"
-msgstr "வீடியோ உள்ளீடு"
-
-#: ../src/empathy-streamed-media-window.c:1140
-msgid "Dialpad"
-msgstr "டயல் அட்டை"
-
-#: ../src/empathy-streamed-media-window.c:1151
-msgid "Details"
-msgstr "விவரங்கள்"
-
-#. 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:1220
-#: ../src/empathy-call-window.c:1782
-#, c-format
-msgid "Call with %s"
-msgstr "%s ஆல் அழை "
-
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2026
-msgid "The IP address as seen by the machine"
-msgstr "கணினி பார்த்தபடி ஐபி முகவரி"
-
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2028
-msgid "The IP address as seen by a server on the Internet"
-msgstr "இணையத்தில் இருந்து சேவயகம் பார்த்தபடி ஐபி முகவரி"
-
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2030
-msgid "The IP address of the peer as seen by the other side"
-msgstr "மற்ற பக்கத்தில் இருந்து பார்த்தபடி பியரின் ஐபி முகவரி"
-
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2032
-msgid "The IP address of a relay server"
-msgstr "மேலனுப்பு சேவையகத்தின் ஐபி முகவர்."
-
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2034
-msgid "The IP address of the multicast group"
-msgstr "பல்வெளியீட்டு குழுவின் ஐபி முகவரி"
-
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "தெரியாத"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "இணைக்கப்பட்டது — %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2798
-msgid "Technical Details"
-msgstr "தொடர்பு விவரங்கள்"
-
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2836
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s' இன் மென்பொருள் உங்கள் கணினியில் ஆதரவு உள்ள எந்த ஒலி இசை ஒழுங்குகளையும் புரிந்து "
-"கொள்ளவில்லை"
-
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2841
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s' இன் மென்பொருள் உங்கள் கணினியில் ஆதரவு உள்ள எந்த விடியோ ஒழுங்குகளையும் புரிந்து "
-"கொள்ளவில்லை"
-
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2847
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-" %s' க்கு ஈனைக்க முடியவில்லை. உங்களில் ஒருவர் நேரடி இணைப்பை அனுமதிக்காத வலைப்பின்னலில் "
-"இருக்கலாம்."
-
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2853
-msgid "There was a failure on the network"
-msgstr "வலைப்பின்னலில் ஒரு தோல்வி"
-
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2857
-msgid "The audio formats necessary for this call are not installed on your computer"
-msgstr "இந்த அழைப்புக்கு தேவையான ஒலி ஒழுங்குக்கு ஆதரவு உங்கள் கணினியில் இல்லை."
-
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2860
-msgid "The video formats necessary for this call are not installed on your computer"
-msgstr "இந்த அழைப்புக்கு தேவையான விடியோ ஒழுங்குக்கு ஆதரவு உங்கள் கணினியில் இல்லை."
-
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2872
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"டெலிபதி உட்கூறு ஒன்றில் எதிர்பாராத ஒன்று நிகழ்ந்தது. தயைசெய்து <a href=\"%s\">report "
-"this bug</a> மேலும் உதவி பட்டியலில் உள்ள 'Debug' சாளரத்தில் காணும் பதிவேட்டு "
-"உள்ளடக்கத்தை இணைக்கவும்.."
-
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2881
-msgid "There was a failure in the call engine"
-msgstr "அழைப்பு பொறியில் ஒரு தோல்வி"
-
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2884
-msgid "The end of the stream was reached"
-msgstr "ஓடையின் இறுதி எட்டப்பட்டது"
-
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2924
-msgid "Can't establish audio stream"
-msgstr "ஒலி ஓடையை நிறுவ முடியவில்லை"
-
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2934
-msgid "Can't establish video stream"
-msgstr "விடியோ ஓடையை நிறுவ முடியவில்லை"
-
 #: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "கேட்பொலி"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
 msgid "Decoding Codec:"
 msgstr "குறிமுறை மீளாக்கம்:"
 
@@ -3482,22 +3124,18 @@ msgid "Display the dialpad"
 msgstr "டயல் பட்டியை காட்டு "
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Encoding Codec:"
 msgstr "குறிமுறை குறிமுறையாக்கம்:"
 
 #: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
 msgid "Hang up"
 msgstr "துண்டி"
 
 #: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
 msgid "Hang up current call"
 msgstr "நடப்பு அழைப்பை துண்டி"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
 msgid "Local Candidate:"
 msgstr "உள்ளமை வேட்பாளர்:"
 
@@ -3510,12 +3148,10 @@ msgid "Minimise me"
 msgstr "என்னை குறைவாக்கு"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
 msgid "Remote Candidate:"
 msgstr "தொலை வேட்பாளர்:"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
 msgid "Send Audio"
 msgstr "ஒலி அனுப்பு "
 
@@ -3540,7 +3176,6 @@ msgid "Swap camera"
 msgstr "காமிராவை மாற்று"
 
 #: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
 msgid "Toggle audio transmission"
 msgstr "ஒலி அனுப்புதலை நிலை மாற்று"
 
@@ -3548,10 +3183,9 @@ msgstr "ஒலி அனுப்புதலை நிலை மாற்று
 msgid "Toggle video transmission"
 msgstr "விடியோ அனுப்புதலை நிலை மாற்று"
 
-#: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2431 ../src/empathy-call-window.c:2432
-#: ../src/empathy-call-window.c:2433 ../src/empathy-call-window.c:2434
+#: ../src/empathy-call-window.ui.h:21 ../src/empathy-call-window.c:2537
+#: ../src/empathy-call-window.c:2538 ../src/empathy-call-window.c:2539
+#: ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "தெரியாத"
 
@@ -3560,7 +3194,6 @@ msgid "Video call"
 msgstr "விடியோ அழைப்பு"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "(_C) அழை"
 
@@ -3569,17 +3202,17 @@ msgid "_Camera"
 msgstr "_C கேமரா "
 
 #: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "_Contents"
 msgstr "உள்ளடக்கங்கள் (_C)"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "_Debug"
 msgstr "(_D) வழு நீக்கு"
 
 #: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Help"
 msgstr "உதவி (_H)"
 
@@ -3592,51 +3225,98 @@ msgid "_Settings"
 msgstr "_S அமைப்புகள்"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_View"
 msgstr "பார்வை (_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "இந்த சாளரத்தை மூடவா?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"இந்த சாளரத்தை மூடினால்%s ஐ விட்டு வெளியேறுவீர்கள்.  நீங்கள் மறு நுழைவு செய்யும் வரை "
+"அங்கிருந்து எந்த செய்தியும் இனி வராது."
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"இந்த சாளரத்தை மூடினால் ஒரு அரட்டை அறையை விட்டு வெளியேறுவீர்கள்.  நீங்கள் மறு நுழைவு "
+"செய்யும் வரை அங்கிருந்து எந்த செய்தியும் இனி வராது."
+msgstr[1] ""
+"இந்த சாளரத்தை மூடினால் %u அரட்டை அறைகளை விட்டு வெளியேறுவீர்கள்.  நீங்கள் மறு நுழைவு "
+"செய்யும் வரை அங்கிருந்து எந்த செய்தியும் இனி வராது."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "%s ஐ விட்டு வெளியேறவா?"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"நீங்கள் இந்த அரட்டை அறையில் மறு நுழைவு செய்யும் வரை இங்கிருந்து எந்த செய்தியும் இனி வராது"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "சாளரத்தை மூடுக"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "அறையை விட்டு வெளியேறுக"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d படிக்காதது)"
 msgstr[1] "%s (%d படிக்காதது)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (மற்றும் %u மற்றவர்)"
 msgstr[1] "%s (மற்றும் %u மற்றவர்கள்)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d மற்றவரிடம் இருந்து படிக்காதது)"
 msgstr[1] "%s (%d மற்றவரிடம் இருந்து படிக்காதவை)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d எல்லோரிடமிருந்தும் படிக்காதது)"
 msgstr[1] "%s (%d எல்லோரிடமிருந்தும் படிக்காதது)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "எஸ்எம்எஸ்:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d செய்தி அனுப்புகிறது"
 msgstr[1] "%d செய்திகள் அனுப்புகிறது"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "செய்திகள் தட்டச்சிடல்"
 
@@ -3716,96 +3396,95 @@ msgstr "தானியங்கி இணை"
 msgid "Manage Favorite Rooms"
 msgstr "பிடித்தமான அறைகளை மேலாள"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "உள்வரும் விடியோ அழைப்பு"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1408
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "உள்வரும் அழைப்பு"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s உங்களுக்கு விடியோ அழைப்பு கொடுக்கிறார். நீங்கள் பதில் பேச வேண்டுமா?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s உங்களை அழைக்கிறார். நீங்கள் பதில் பேச வேண்டுமா?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s இடமிருந்து உள்வரும் அழைப்பு"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "(_R) ஏற்காதே"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
 msgstr "(_A) பதிலளி"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:560
 msgid "_Answer with video"
 msgstr "_A வீடியோவால் பதில் கொடு"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1414
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s இடமிருந்து உள்வரும் விடியோ அழைப்பு"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "அறை அழைப்பு"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s இல் சேர உங்களை அழைத்துள்ளார்"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s உங்களை %s உடன் சேர அழைக்கிறார்."
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "நிராகரி (_D)"
 
-#: ../src/empathy-event-manager.c:858
+#: ../src/empathy-event-manager.c:800
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "(_J) இணை"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s  %s இல் சேர உங்களை அழைத்துள்ளார்"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s இல் சேர உங்களை அழைத்துள்ளனர்"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s இடமிருந்து உள்வரும் கோப்பு பரிமாற்றம்."
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "கடவுச்சொல் தேவைப்படுகிறது"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s நீங்கள் இணைப்பில் இருக்கும் போது காண அனுமதி வேண்டுகிறார். "
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
@@ -3815,105 +3494,105 @@ msgstr ""
 "செய்தி: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "தெரியாத"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s %sல் %s/s இல்"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s %sல் "
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr " \"%s\" ஐ %s இடமிருந்து பெறுகிறது"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "\"%s\" ஐ %s க்கு அனுப்புகிறது"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr " \"%s\" ஐ %s இடமிருந்து பெறுகையில் பிழை"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "கோப்பு பெறுகையில் பிழை"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "\"%s\" ஐ %s க்கு அனுப்புகையில் பிழை"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "கோப்பு அனுப்புவதில் பிழை"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\"  %s இடமிருந்து கிடைத்தது"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" %s க்கு அனுப்பப்பட்டது"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "கோப்பு பறிமாற்றம் முடிந்தது"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "மற்ற பங்கேற்பாளரின் பதிலுக்கு காத்திருத்தல்"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr " \"%s\" இன் நம்பகத்தன்மையை சோதிக்கிறது"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr " \"%s\" இன் ஹாஷ் மதிப்பை கணக்கிடுகிறது"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "கோப்பு"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "மீதமுள்ளவை"
 
@@ -3927,7 +3606,11 @@ msgstr ""
 "பூர்த்தியானது, ரத்து செய்யப்பட்டது, தோல்வி அடைந்தது ஆகிய கோப்பு பரிமாற்றங்களை பட்டியலில் "
 "இருந்து  நீக்கு "
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_I இறக்குமதி செய்"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -3935,171 +3618,195 @@ msgstr ""
 "கணக்குகள் ஏதும் இறக்குமதி செய்ய இல்லை. எம்பதி இப்போதைக்கு பிட்ஜின் இலிருந்து மட்டுமே "
 "இறக்குமதிகளை அனுமதிக்கிறது."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "இறக்குமதி செய் கணக்குகள்"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "இறக்குமதி செய்"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "விதிமுறை"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "மூலம்"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "கடவுச்சொல் ஐ தா"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "துண்டி"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "தொடர்புகளை இங்கே காண நீங்கள் ஒரு கணக்கை துவக்க வேண்டும்."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "பொருத்தம்  ஏதும் காணப்படவில்லை"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "மன்னிக்க, %s கணக்குகள் உங்கள் %s மென்பொருள் மேம்படுத்தப்படும் வரை பயன்படுத்த இயலாது."
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "மென்பொருளை மேம்படுத்து..."
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "மூடு"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "மீள் இணை"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "கணக்குகளை திருத்துக"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "மூடு"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "நிரப்பு %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "கணக்கு இருப்பை நிரப்பு"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "நிரப்பு..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "தொடர்பு"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "தொடர்புகளை இங்கே காண நீங்கள் உங்களது ஒரு கணக்கை செயலாக்க வேண்டும்."
+
+#. 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 "தொடர்புகளை இங்கே காண நீங்கள்  %s ஐ செயலாக்க வேண்டும்."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "தொடர்பு பட்டியல்"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "கணக்கு அமைப்புகள்"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "(_M) தொடர்புகளை படத்தில் காட்டு "
 
-#: ../src/empathy-main-window-menubar.ui.h:2
+#: ../src/empathy-roster-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "கட்டண மீதம்"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
+#: ../src/empathy-roster-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "தொடர்பு பட்டியல் இல் காண்க "
 
-#: ../src/empathy-main-window-menubar.ui.h:4
+#: ../src/empathy-roster-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "(_F) விருப்பங்கள் சேர் "
 
-#: ../src/empathy-main-window-menubar.ui.h:5
+#: ../src/empathy-roster-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "விருப்பங்களை மேலாளுக"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
+#: ../src/empathy-roster-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr " (_o) சாதாரண அளவு"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#: ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "_C புதிய அழைப்பு"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
+#: ../src/empathy-roster-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "( _A) சாதாரண அளவு அவதாரங்கள் உடன்"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "(_r) விருப்பங்கள்"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "_r விதிமுறைகளை காட்டு"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "(_N) பெயர் ஆல் வரிசைப்படுத்து"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "(_S) நிலை வாரியாக வரிசைப்படுத்து"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "கணக்குகள் (_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "_B தடுக்கப்பட்ட தொடர்புகள்"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "(_C) அடக்கமான அளவு"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "(_F) கோப்பு பறிமாற்றங்கள் "
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "(_J) இணை"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-roster-window-menubar.ui.h:24
 #: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "_N புதிய உரையாடல்"
 
-#: ../src/empathy-main-window-menubar.ui.h:25
+#: ../src/empathy-roster-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "(_O) இணைப்பு விலகி உள்ள தொடர்புகள்"
 
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "(_P) தனிப்பட்ட தகவல்"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "(_R) அறை"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "_S தொடர்புகள் ஐ தேடு..."
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "அரட்டை அறை"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "உறுப்பினர்கள்"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4112,16 +3819,21 @@ msgstr ""
 "கடவுச்சொல் தேவை: %s\n"
 "உறுப்பினர்கள்: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "ஆம்"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "இல்லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "அறை பட்டியலை எடுப்பதை துவக்க முடியவில்லை"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "அறை பட்டியலை எடுப்பதை நிறுத்த முடியவில்லை"
 
@@ -4155,79 +3867,79 @@ msgstr "அறை பட்டியல்"
 msgid "_Room:"
 msgstr "(_R) அறை:"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "தகவல் பெறப்பட்டது"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "தகவல் அனுப்பப்பட்டது"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "புதிய உரையாடல்"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
-msgstr "தொடர்பு இணைபில் வருகிறார்"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "தொடர்பு இணைப்பில் வருகிறார்"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "தொடர்பு இணைப்பு விலகி செல்கிறார்"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "கணக்கு இணைக்கப்பட்டது"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "கணக்கு இணைப்பு நீக்கப்பட்டது"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "மொழி"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "ஜூலியட்"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ரோமியோ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ஓ ரோமியோ ரோமியோ எங்கிருக்கிறாய் ரோமியோ?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "உங்கள் தந்தையை மறு மற்றும் உன் பெயரை விலக்கு;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "மாட்டாய் என்றால் என் காதலை சத்தியம் செய்கிறேன்"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "அப்புறம் நான் கேபுலெட் ஆக இருக்க மாட்டேன்"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "இன்னும் கேட்க முடியுமா அல்லது இதுபோல் பேசவா? "
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "ஜூலியட் தொடர்பை துண்டித்தார்"
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "விருப்பங்கள்"
 
@@ -4286,35 +3998,27 @@ msgstr "மொழிகளுக்கு எழுத்து பிழை த
 msgid "General"
 msgstr "பொது"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "உள்ளீட்டு மட்டம்:"
-
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "உள்ளீடு ஒலி அளவு:"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "இட மூலங்கள்:"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Log conversations"
 msgstr "உரையாடல்களை பதிவேட்டில் குறி"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "அறிவிப்புகள்"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Play sound for events"
 msgstr "நிகழ்வுகளுக்கு ஒலியை இயக்கு"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Privacy"
 msgstr "அந்தரங்கம்"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -4323,23 +4027,27 @@ msgstr ""
 "குறைத்த இட குறிப்பு எனில் உங்கள் மாநகரம், மாநிலம், நாடு தவிர ஒன்றும் வெளியிடப்படாது. "
 "ஜிபிஎஸ் ஆயத்தொலைவுகளுக்கு 1 தசம இடம் திருத்தமாக இருக்கும்."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "(_s) சிரிப்பான்களை பிம்பங்களாக காட்டு"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
 msgid "Show contact _list in rooms"
 msgstr "(_l) அறைகளில் தொடர்பு பட்டியல் ஐ காட்டு "
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "ஒலிகள்"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "எழுத்து பிழை திருத்தம்"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "அரட்டையை இதில் துவங்கு:"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
@@ -4347,10 +4055,14 @@ msgstr ""
 "இந்த பட்டியல் நீங்கள் எந்த மொழிகளுக்கு அகராதி நிறுவி இருக்கிறீர்களோ அவற்றை மட்டுமே "
 "காட்டுகிறது"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "கருத்துகள்"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "Use _echo cancellation to improve call quality"
+msgstr "_e அழைப்பு தரத்தை மேம்படுத்த எதிரொலி நீக்கத்தை பயன்படுத்துக "
+
 #: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "மாற்று:"
@@ -4380,18 +4092,22 @@ msgid "_Network (IP, Wi-Fi)"
 msgstr "_N வலையமைப்பு (ஐபி, வைஃபை)"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "(_O) புதிய அரட்டைகளை தனி சாளரங்களில் திற"
-
-#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "(_P) என் தொடர்புகளுக்கு இடத்தை வெளியிடு"
 
 #. 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:40
+#: ../src/empathy-preferences.ui.h:39
 msgid "_Reduce location accuracy"
 msgstr "(_R) இடத்தின் குறிப்பை குறை"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr " _w புதிய சாளரங்கள்"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "_b புதிய கீற்றுகள்"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "நிலை"
@@ -4400,246 +4116,688 @@ msgstr "நிலை"
 msgid "_Quit"
 msgstr "வெளியேறு (_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "தொடர்பாளரை மீண்டும் அழை"
-
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "கேமரா செயலிலில்லை"
-
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "கேமரா செயலில்"
-
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "காமிராவை செயலிழக்கச் செய்து விடியோ அனுப்புவதை நிறுத்துக."
-
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "காமிராவை செயலாக்கி விடியோ அனுப்புக."
-
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "காமிராவை செயலாக்குக; ஆனால் விடியோ அனுப்ப வேண்டாம்."
-
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "முன்பார்வை"
-
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "மறு முயற்சி"
-
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_i வீடியோ "
-
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "வீடியோ செயலில் இல்லை"
-
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "வீடியோ செயலில் உள்ளது"
-
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ஒளித்தோற்ற முன்னோட்டம்"
-
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "தொடர்புகள் படக்காட்சி"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1598
 msgid "Save"
 msgstr "சேமி"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1658
+msgid "Pastebin link"
+msgstr "பேஸ்ட்பின் தொடுப்பு"
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin response"
+msgstr "பேஸ்ட்பின் எதிர்வினை"
+
+#: ../src/empathy-debug-window.c:1671
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1674
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "தரவு ஒற்றை ஒட்டலுக்கு மிகப்பெரியது. பதிவை தயைசெய்து கோப்புக்கு சேமிக்கவும்."
+
+#: ../src/empathy-debug-window.c:1903
 msgid "Debug Window"
 msgstr "வழு நீக்கு சாளரம்"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1961
+msgid "Send to pastebin"
+msgstr "பேஸ்ட்பின் க்கு அனுப்பு "
+
+#: ../src/empathy-debug-window.c:2000
 msgid "Pause"
 msgstr "தாமதி"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2012
 msgid "Level "
 msgstr "மட்டம்"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2031
 msgid "Debug"
 msgstr "வழுநீக்கு"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2036
 msgid "Info"
 msgstr "தகவல்"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2041 ../src/empathy-debug-window.c:2087
 msgid "Message"
 msgstr "செய்தி"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2046
 msgid "Warning"
 msgstr "எச்சரிக்கை"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2051
 msgid "Critical"
 msgstr "ஆபத்தான"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2056
 msgid "Error"
 msgstr " பிழை"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2075
 msgid "Time"
 msgstr "நேரம்"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2078
 msgid "Domain"
 msgstr "களம்"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2080
 msgid "Category"
 msgstr "வகை"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2082
 msgid "Level"
 msgstr "மட்டம்"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2105
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "தேர்ந்தெடுத்த இணைப்பு மேலாளர் தொலை வழு நீக்கத்தை ஆதரிக்கவில்லை"
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "பங்கேற்பாளரை அழை"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "உரையாடலில் பங்கு  கொள்ள ஒ ரு தொடர்பை  தேர்ந்தெடுக்கவும்:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "அழை"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "எந்த  உரையாடலையும்  காட்ட  வேண்டாம்,  வேலை  செய்ய   வேண்டாம் (-எ-கா இறக்குமதி) மற்றும் "
 "வெளியேறுக"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "அருகில் உள்ள நபர்கள் கணக்குகள்  இருப்பு அல்லாது வேறு எந்த  உரையாடலையும்  காட்ட  "
 "வேண்டாம்,  "
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "கொடுத்த கணக்கை முதலில் தேர்வு செய்யவும் (eg, gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "எம்பதி கணக்குகள்"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "எம்பதி கணக்குகள்"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "ஒரு குறிப்பிட்ட சேவையை காட்டு"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "-எம்பதி வழு நீக்கி"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "எம்பதி வழு நீக்கி"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "-எம்பதி அரட்டைசார்ந்தோன் "
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "பதிலளி"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1418
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "ஏற்காதே"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1419
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "பதிலளி"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:206
 msgid "Answer with video"
 msgstr "வீடியோவால் பதில் கொடு"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "நிராகரி"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "ஏற்றுக்கொள்"
 
 #. 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:260
+#: ../src/empathy-notifications-approver.c:239
 msgid "Provide"
 msgstr "அளி"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s உங்களை அழைக்க விரும்பினார், ஆனால் நீங்கள் வேறு அழைப்பில் இருந்தீர்கள்."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1047 ../src/empathy-call-window.c:1070
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2727
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
+#, c-format
+msgid "Call with %s"
+msgstr "%s ஆல் அழை "
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "கணினி பார்த்தபடி ஐபி முகவரி"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "இணையத்தில் இருந்து சேவயகம் பார்த்தபடி ஐபி முகவரி"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "மற்ற பக்கத்தில் இருந்து பார்த்தபடி பியரின் ஐபி முகவரி"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "மேலனுப்பு சேவையகத்தின் ஐபி முகவர்."
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "பல்வெளியீட்டு குழுவின் ஐபி முகவரி"
+
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "தற்காலிக நிறுத்தம்"
 
-#: ../src/empathy-call-window.c:2730
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "ஒலி நிறுத்தம்"
 
-#: ../src/empathy-call-window.c:2732
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "கால அளவு"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2735
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
+#: ../src/empathy-call-window.c:2987
+msgid "Technical Details"
+msgstr "தொடர்பு விவரங்கள்"
+
+#: ../src/empathy-call-window.c:3026
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr ""
+"%s' இன் மென்பொருள் உங்கள் கணினியில் ஆதரவு உள்ள எந்த ஒலி இசை ஒழுங்குகளையும் புரிந்து "
+"கொள்ளவில்லை"
+
+#: ../src/empathy-call-window.c:3031
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr ""
+"%s' இன் மென்பொருள் உங்கள் கணினியில் ஆதரவு உள்ள எந்த விடியோ ஒழுங்குகளையும் புரிந்து "
+"கொள்ளவில்லை"
+
+#: ../src/empathy-call-window.c:3037
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr ""
+" %s' க்கு ஈனைக்க முடியவில்லை. உங்களில் ஒருவர் நேரடி இணைப்பை அனுமதிக்காத வலைப்பின்னலில் "
+"இருக்கலாம்."
+
+#: ../src/empathy-call-window.c:3043
+msgid "There was a failure on the network"
+msgstr "வலைப்பின்னலில் ஒரு தோல்வி"
+
+#: ../src/empathy-call-window.c:3047
+msgid "The audio formats necessary for this call are not installed on your computer"
+msgstr "இந்த அழைப்புக்கு தேவையான ஒலி ஒழுங்குக்கு ஆதரவு உங்கள் கணினியில் இல்லை."
+
+#: ../src/empathy-call-window.c:3050
+msgid "The video formats necessary for this call are not installed on your computer"
+msgstr "இந்த அழைப்புக்கு தேவையான விடியோ ஒழுங்குக்கு ஆதரவு உங்கள் கணினியில் இல்லை."
+
+#: ../src/empathy-call-window.c:3062
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"டெலிபதி உட்கூறு ஒன்றில் எதிர்பாராத ஒன்று நிகழ்ந்தது. தயைசெய்து <a href=\"%s\">report "
+"this bug</a> மேலும் உதவி பட்டியலில் உள்ள 'Debug' சாளரத்தில் காணும் பதிவேட்டு "
+"உள்ளடக்கத்தை இணைக்கவும்.."
+
+#: ../src/empathy-call-window.c:3071
+msgid "There was a failure in the call engine"
+msgstr "அழைப்பு பொறியில் ஒரு தோல்வி"
+
+#: ../src/empathy-call-window.c:3074
+msgid "The end of the stream was reached"
+msgstr "ஓடையின் இறுதி எட்டப்பட்டது"
+
+#: ../src/empathy-call-window.c:3114
+msgid "Can't establish audio stream"
+msgstr "ஒலி ஓடையை நிறுவ முடியவில்லை"
+
+#: ../src/empathy-call-window.c:3124
+msgid "Can't establish video stream"
+msgstr "விடியோ ஓடையை நிறுவ முடியவில்லை"
+
+#: ../src/empathy-call-window.c:3161
+#, c-format
+msgid "Your current balance is %s."
+msgstr "உங்களை நடப்பு வைப்புத்தொகை %s."
+
+#: ../src/empathy-call-window.c:3165
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "மன்னிக்கவும், உங்கள் கணக்கில் அந்த அழைப்புக்கு போதிய பணமில்லை"
+
+#: ../src/empathy-call-window.c:3167
+msgid "Top Up"
+msgstr "கட்டணம் செலுத்து"
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- எம்பதி கேட்பொலி/ வீடியோ சார்ந்தோன்"
+
+#: ../src/empathy-call.c:223
+msgid "Empathy Audio/Video Client"
+msgstr "எம்பதி கேட்பொலி/ வீடியோ சார்ந்தோன்"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_M பொருத்த நிலை"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "எந்த வகையான அரட்டை கணக்கை நீங்கள் பெற்றிருக்கிறீர்கள்?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "புதிய கணக்கை சேர்க்கிறது"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "அருகில் உள்ள மக்கள்"
+
+#: ../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."
+msgstr ""
+"எம்பதியால் தானியங்கியாக உங்களைப்போலவே உள் வலையில் உள்ளோரை கண்டு பிடித்து அரட்டை அடிக்க "
+"இயலும். இந்த அம்சத்தை நீங்கள் செயலாக்க விரும்பினால் கீழ் கண்டுள்ள விவரங்களை சரி பார்க்கவும். "
+
+#: ../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 ""
+"தொடர்பு பட்டியலில் <span style=\"italic\">Edit → Accounts</span> ஐ தேர்ந்தெடுத்து "
+"நீங்கள் இந்த விவரங்களை மாற்றலாம் அல்லது இந்த அம்சத்தை செயல் நீக்கலாம்."
+
+#~ msgid "Call volume"
+#~ msgstr "அழைப்பு ஒலி அளவு"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "அழைப்பு ஒலி அளவு, சதவிகிதமாக."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "எம்பதி பட்டர்ப்ளை லாக்ஸ் இலிருந்து இட மாற்றம் ஆகிவிட்டது"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "எம்பதி பட்டர்ப்ளை லாக்ஸ் இலிருந்து இட மாற்றம் ஆகிவிட்டதா? "
+
+#~ msgid "Socket type not supported"
+#~ msgstr "சொருகி வாய் வகை க்கு ஆதரவில்லை"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "என் வலை கணக்குகள் "
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s கணக்கு %s வழியாக திருத்தப்பட வேண்டும்."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s கணக்கை எம்பதிக்கு சேர்க்க்க இயலாது. "
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "என் வலை கணக்குகள் ஐ துவக்குக. "
+
+#~ msgid "Edit %s"
+#~ msgstr "%s ஐ திருத்து"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_n ரத்துசெய்க"
+
+#~ msgid "Personal Information"
+#~ msgstr "தனிப்பட்ட தகவல்"
+
+#~ msgid "Ungrouped"
+#~ msgstr "குழுவில் சேர்க்காத "
+
+#~ msgid "Favorite People"
+#~ msgstr "பிடித்தமான நபர்கள் "
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "திருத்து (_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "ஒரு தொடர்பு ஐ தேர்வு செய்க"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "தொடுப்பில் உள்ள தொடர்புகள்"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "தொடுப்புக்கு தொடர்புகளை  ஐ தேர்வு செய்க"
+
+#~ msgid "New contact preview"
+#~ msgstr "புதிய தொடர்பு முன் பார்வை"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "இடது பக்கம் உள்ள பட்டியலில் தெர்ந்தெடுத்த தொடர்புகள் ஒண்றாக இணைக்கப்படும்."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_L தொடர்புகள் ஐ தொடு..."
+
+#~ msgid "Link Contacts"
+#~ msgstr "தொடர்புகள் ஐ தொடு"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_U தொடுப்பை விலக்கு..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "காட்டப்பட்ட தொடர்புகளில்  உள்ள தொடர்புகளை தனிதனி தொடர்புகளாக முழுக்க பகிரவும்."
+
+#~ msgid "_Link"
+#~ msgstr "_L தொடுப்பு"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "தொடர்பு '%s' இன்  இணைப்புகளை நீக்கவா?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "நீங்கள் நிச்சயமாக இந்த சங்கிலி தொடர்பை நீக்க வேண்டுமா? இது இணைத்த தொடர்புகளை தனித்தனி "
+#~ "தொடர்புகளாக முழுக்க பகிர்ந்துவிடும்."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_U இணைப்பை விலக்கு"
+
+#~ msgid "Contact ID:"
+#~ msgstr "தொடர்பு ஐடி (ID):"
+
+#~ msgid "C_hat"
+#~ msgstr "(_h) அரட்டை"
+
+#~ msgid "Send _Video"
+#~ msgstr "_V விடியோ அனுப்பு"
+
+#~ msgid "C_all"
+#~ msgstr "(_a) அழை"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "உங்கள் நடப்பு நிலையையும் இருப்பையௌம் அமை "
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "தேர்ந்தெடுக்கப்பட்ட தொடர்பாளர் கோப்புகளை பெற முடியாது"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "தேர்ந்தெடுக்கப்பட்ட தொடர்பாளர் இணைப்பு விலகி உள்ளார்"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "கணக்குகளை இறக்கும் போது ஒரு பிழை."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "கணக்கு விவரங்களை பகுக்கும் போது ஒரு பிழை."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "கணக்கை உருவாக்கும் போது ஒரு பிழை."
+
+#~ msgid "There was an error."
+#~ msgstr "அங்கே ஒரு பிழையாக ஏற்பட்டது."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "பிழை செய்தி: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "நீங்கள் பின்னாலும் சென்று மற்றும் உங்களது கணக்குகளின் விவரங்களை மீண்டும் உள்ளிட "
+#~ "முயற்சிக்கலாம் அல்லது இந்த வழிகாட்டியை நிறுத்தலாம் மற்றும் மெனுவை திருத்துவதிலுருந்து "
+#~ "பின்னர் கணக்குகளை சேர்க்கலாம்."
+
+#~ msgid "An error occurred"
+#~ msgstr "ஒரு பிழை ஏற்பட்டது"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr ""
+#~ "நீங்கள் அமைக்க விரும்புவதற்கு உங்களுக்கு ஏதேனும் மற்ற அரட்டை கணக்குகள் இருக்கிறதா?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "உங்களது கணக்கு விவரங்களை உள்ளிடவும்"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "எந்த வகையான அரட்டை கணக்கை நீங்கள் உருவாக்க விரும்புகிறீர்கள்?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "மற்ற அரட்டை கணக்குகளை உருவாக்க நீங்கள் விரும்புகிறீர்களா?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "புதிய கணக்கிற்கு விவரங்களை உள்ளிடவும்"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "எம்பதி (Empathy ) உடன் நீங்கள் ஆன்லைனில் அருகிலிருக்கும் மக்கள் மற்றும் நண்பர்கள் மற்றும் "
+#~ "Google Talk, AIM, Windows Live போன்றவற்றை பயன்ற்றுபடுத்தி மற்றும் மற்ற பல அரட்டை "
+#~ "நிரல்களில் இருக்கும் கொலிக்ஸ் உடன் அரட்டை அடிக்கலாம். மைக்ரோ போன் அல்லது "
+#~ "வெப்கேமிராவினால் நீங்களும் ஆடியோ அல்லது வீடியோ அழைப்புகளை பெறலாம். "
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "மற்ற அரட்டை நிரலை பயன்படுத்திக் கொண்டிருக்கிற உங்களுக்கு ஒரு கணக்கு உள்ளதா?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "ஆம், எனது கணக்கு விவரங்களை இதிலிருந்து இறக்கவும் "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "ஆம், இப்போது எனது கணக்கு விவரங்களை உள்ளிடுகிறேன்"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "இல்லை, எனக்கு ஒரு புதிய கணக்கு வேண்டும்"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr ""
+#~ "இல்லை, இப்போது ஆன்லைனில் எனக்கு அருகிலிருக்கும் மக்களை நான் பார்க்க விரும்புகிறேன்"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "நீங்கள் இறக்க விரும்பும் கணக்குகளை தேர்ந்தெடுக்கவும்:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "இல்லை, இப்போதைக்கு அவ்வளவு தான்"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr " திருத்துக->கணக்குகள்"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "_n இல்லை, இப்போது இந்த அம்சத்தை செயலாக்க விரும்பவில்லை"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "டெலிபதி-சலுட் நிறுவப்படவில்லை. அதனால் உள் வலையில் இணைந்துள்ள மக்களுடன் நீங்கள் "
+#~ "அரட்டையடிக்க இயலாது. இந்த அம்சத்தை நீங்கள் செயலாக்க விரும்பினால் டெலிபதி-சலுட் "
+#~ "நிறுவுங்கள். மேலும் கணக்கு உரையாடல் மூலம் அண்மையில் உள்ளோர் கணக்கு ஒன்று துவக்கவும். "
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "செய்தி அனுப்புதல் மற்றும் வோய்ப் கணக்குகள் உதவியாளர்"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "எம்பதிக்கு வரவேற்பு"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "உங்களிடம் இருக்கிற கணக்குகளை இறக்கவும்"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "தயை செய்து சொந்த விவரங்களை உள்ளிடுக"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "நீங்கள் புதிய கணக்கை துவக்கப்போகிறீர்கள்!அது உங்கள் \n"
+#~ "மாற்றங்களை விலக்கிவிடும். நிச்சயம் தொடர வேண்டுமா?"
+
+#~ msgid "Protocol:"
+#~ msgstr "விதிமுறை:"
+
+#~ msgid "Contrast"
+#~ msgstr "வேறுபாடு"
+
+#~ msgid "Brightness"
+#~ msgstr "வெளிச்சம்"
+
+#~ msgid "Gamma"
+#~ msgstr "காமா"
+
+#~ msgid "Volume"
+#~ msgstr "ஒலி அளவு"
+
+#~ msgid "_Sidebar"
+#~ msgstr "பக்கப்பட்டை(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "ஒலி உள்ளீடு"
+
+#~ msgid "Video input"
+#~ msgstr "வீடியோ உள்ளீடு"
+
+#~ msgid "Dialpad"
+#~ msgstr "டயல் அட்டை"
+
+#~ msgid "Details"
+#~ msgstr "விவரங்கள்"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "தெரியாத"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "இணைக்கப்பட்டது — %d:%02dm"
+
+#~ msgid "_Personal Information"
+#~ msgstr "(_P) தனிப்பட்ட தகவல்"
+
+#~ msgid "Input level:"
+#~ msgstr "உள்ளீட்டு மட்டம்:"
+
+#~ msgid "Input volume:"
+#~ msgstr "உள்ளீடு ஒலி அளவு:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "(_O) புதிய அரட்டைகளை தனி சாளரங்களில் திற"
+
+#~ msgid "Call the contact again"
+#~ msgstr "தொடர்பாளரை மீண்டும் அழை"
+
+#~ msgid "Camera Off"
+#~ msgstr "கேமரா செயலிலில்லை"
+
+#~ msgid "Camera On"
+#~ msgstr "கேமரா செயலில்"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "காமிராவை செயலிழக்கச் செய்து விடியோ அனுப்புவதை நிறுத்துக."
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "காமிராவை செயலாக்கி விடியோ அனுப்புக."
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "காமிராவை செயலாக்குக; ஆனால் விடியோ அனுப்ப வேண்டாம்."
+
+#~ msgid "Preview"
+#~ msgstr "முன்பார்வை"
+
+#~ msgid "Redial"
+#~ msgstr "மறு முயற்சி"
+
+#~ msgid "V_ideo"
+#~ msgstr "_i வீடியோ "
+
+#~ msgid "Video Off"
+#~ msgstr "வீடியோ செயலில் இல்லை"
+
+#~ msgid "Video On"
+#~ msgstr "வீடியோ செயலில் உள்ளது"
+
+#~ msgid "Video Preview"
+#~ msgstr "ஒளித்தோற்ற முன்னோட்டம்"
+
 #~ msgid "All"
 #~ msgstr "அனைத்து"
 
diff --git a/po/te.po b/po/te.po
index 9516ee0b2..19464cb48 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,29 +1,29 @@
 # translation of empathy.master.te.po to Telugu
-# Copyright (C) 2011 Gnome Contributors
+# Copyright (C) 2012 Swecha localisation Team
 # This file is distributed under the same license as the empathy package.
 #
 #
 # Krishna Babu K <kkrothap@redhat.com>, 2009.
 # Praveen Illa <mail2ipn@gmail.com>, 2011.
 # Krishnababu Krothapalli <kkrothap@redhat.com>, 2011.
+# Sasi Bhushan Boddepalli <Sasi@swecha.net>,2011
+# GVS.Giri <gvs.giri947@gmail.com>,2012.
+# Sasi Bhushan Boddepalli <Sasi@swecha.net>,2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy.master.te\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-15 10:09+0000\n"
-"PO-Revision-Date: 2011-06-15 20:28+0530\n"
-"Last-Translator: Krishnababu Krothapalli <kkrothap@redhat.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2011-10-09 06:09+0000\n"
+"PO-Revision-Date: 2012-01-31 19:11+0530\n"
+"Last-Translator:Praveen Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Lokalize 1.2\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
-"\n"
-"\n"
-"\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "Language: te\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -47,429 +47,438 @@ msgid "Always open a separate chat window for new chats."
 msgstr "కొత్త చాట్‌లకు ఎల్లప్పుడు ఒక వేరే కొత్త చాట్ విండోను తెరువు."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+msgid "Call volume"
+msgstr "కాల్ ఘణపరిమాణము"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Call volume, as a percentage."
+msgstr "కాల్ ఘణపరిమాణము, ఒక శాతముగా"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Camera device"
+msgstr "కెమెరా పరికరం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Camera position"
+msgstr "కెమెరా స్థానము"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"గుంపు చాట్ నందు నిక్ కంప్లీషన్ (ట్యాబ్) ఉపయోగిస్తున్నప్పుడు మారుపేరు తరువాత "
-"జతచేయవలసిన అక్షరము."
+"గుంపు చాట్ నందు నిక్ కంప్లీషన్ (ట్యాబ్) ఉపయోగిస్తున్నప్పుడు మారుపేరు తరువాత జతచేయవలసిన అక్షరము."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Chat window theme"
 msgstr "చాట్ విండో థీము"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-#, fuzzy
-#| msgid "Chat window theme"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Chat window theme variant"
-msgstr "చాట్ విండో థీము"
+msgstr "మాట్లాడుకొను కిటికీ (చాట్ విండో) థీం మార్పులు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"ఉపయోగించుటకు కామాతో వేరుచేయబడివున్న అక్షరక్రమం తనిఖీచేయు భాషల యొక్క జాబితా (ఉ."
-"దా. en, fr, nl)."
+"ఉపయోగించుటకు కామాతో వేరుచేయబడివున్న అక్షరక్రమం తనిఖీచేయు భాషల యొక్క జాబితా (ఉ.దా. en, fr, nl)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Compact contact list"
 msgstr "కాంపాక్టు పరిచయ జాబితా"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Connection managers should be used"
 msgstr "అనుసంధాన నిర్వాహకాలను తప్పక ఉపయోగించాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Contact list sort criterion"
 msgstr "పరిచయ జాబితా క్రమబద్దీకరణ విధానము"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "వీడియో కాల్స్ లో ఉపయోగించడానికి అప్రమేయ కెమెరా పరికరం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Default directory to select an avatar image from"
 msgstr "అవతార బొమ్మను ఎంచుకొనుటకు అప్రమేయ డైరెక్టరీ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Disable popup notifications when away"
 msgstr "దూరంగా ఉన్నప్పుడు పాప్అప్ ప్రకటనలను అచేతనముచేయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Disable sounds when away"
 msgstr "దూరంగా ఉన్నప్పుడు శబ్దములను అచేతనము చేయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Display incoming events in the status area"
 msgstr "లోనికివచ్చు ఘటనలను స్థితి ప్రాంతములో చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
 msgstr ""
-"లోనికివచ్చు ఘటనలను స్థితి ప్రదేశములో చూపించు. ఒకవేళ తప్పయినట్లయితే, వాడుకరికి "
-"సత్వరమే చూపించు."
+"లోనికివచ్చు ఘటనలను స్థితి ప్రదేశములో చూపించు. ఒకవేళ తప్పయినట్లయితే, వాడుకరికి సత్వరమే చూపించు."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Echo cancellation support"
+msgstr "అతి ధ్వనులను నిర్మూలించడానికి సహకారం"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy can publish the user's location"
 msgstr "ఎంపతి వాడుకరి యొక్క స్థానమును ప్రచురించగలదు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy can use the GPS to guess the location"
 msgstr "స్థానమును అంచనావేయుటకు ఎంపతి GPSను ఉపయోగించగలదు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "స్థానమును అంచనా వేయుటకు ఎంపతి సెల్యులర్ నెట్‌వర్కును ఉపయోగించగలదు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Empathy can use the network to guess the location"
 msgstr "స్థానమును అంచానావేయుటకు ఎంపతి నెట్‌వర్కును ఉపయోగించగలదు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Empathy default download folder"
 msgstr "ఎంపతి అప్రమేయ డౌన్‌లోడు సంచయం"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Empathy has migrated butterfly logs"
-msgstr ""
+msgstr "అభివృధ్ధి చెందిన సీతాకోక చిలుక లాగ్ లు ఎంపతి కలిగి వున్నది"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Empathy should auto-away when idle"
 msgstr "ఎంపతి వాడుకలో లేనపుడు దూరంగా ఉన్నట్టు చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Empathy should auto-connect on startup"
 msgstr "ప్రారంభములో ఎంపతి స్వయంగా-అనుసంధానించబడాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Empathy should reduce the location's accuracy"
 msgstr "స్థానము యొక్క ఖచ్చితత్వమును ఎంపతి తప్పక తగ్గించవలెను"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ఎంపతి పరిచయం యొక్క అవతారమును చాట్ విండో ప్రతీక వలె ఉపయోగించాలి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Enable WebKit Developer Tools"
 msgstr "వెబ్‌కిట్ అభివృద్ధికారుని సాధనములను చేతనపరుచు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Enable popup notifications for new messages"
 msgstr "కొత్త సందేశములు కొరకు పాప్అప్ ప్రకటనలను చేతనపరుచు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Enable spell checker"
 msgstr "అక్షరక్రమం తనిఖీచేయుదానిని చేతనపరుచు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Hide main window"
 msgstr "ప్రధాన విండోను దాయి"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Hide the main window."
 msgstr "ప్రధాన విండోను దాయి."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "మారుపేరును పూర్తిచేయు అక్షరము"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "కొత్త చాట్‌లను వేరువేరు విండోలలో తెరువు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "ఉపయోగించుటకు అడియమ్ థీము యొక్క పాత్."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"ఒకవేళ చాట్‌నకు ఉపయోగించిన థీమ్ అడియమ్ అయితే అడియమ్ థీము వాడటానికి అవసరమగు "
-"పాత్."
+msgstr "ఒకవేళ చాట్‌నకు ఉపయోగించిన థీమ్ అడియమ్ అయితే అడియమ్ థీము వాడటానికి అవసరమగు పాత్."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "లోనికివచ్చు సందేశములకు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "కొత్త సంభాషణలకు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "బయటకుపోవు సందేశములకు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "పరిచయం ప్రవేశించినపుడు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "పరిచయం నిష్క్రమించినపుడు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "మనము ప్రవేశించినపుడు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "మనము నిష్క్రమించినపుడు శబ్దమును వినిపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "చాట్ పై దృష్టి సారించకపోతే ప్రకటనలను పైన చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "పరిచయం లాగిన్ అయినప్పుడు ప్రకటనలు పైన చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "పరిచయం నిష్క్రమించినపుడు ప్రకటనలను చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "Position the camera preview should be during a call."
+msgstr "కెమెరా ఉపదర్శన స్థానము ఖచ్చితంగా కాల్ మధ్యలో  ఉండవలెను"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "పరిచయ జాబితాలో సమతుల్యతను చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "అవతారములను చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Show contact list in rooms"
 msgstr "గదులలో పరిచయ జాబితాను చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show hint about closing the main window"
 msgstr "ప్రధాన విండోను మూసివేయుటకు సూచనను చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show offline contacts"
 msgstr "ఆఫ్‌లైన్ పరిచయాలను చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show protocols"
 msgstr "ప్రోటోకాల్సును చూపించు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Spell checking languages"
 msgstr "అక్షరక్రమ తనిఖీచేయు భాషలు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "The default folder to save file transfers in."
 msgstr "ఫైళ్ళ బదిలీకరణలను వ్యవస్థలో భద్రపరుచుటకు అప్రమేయ సంచయం."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The last directory that an avatar image was chosen from."
 msgstr "అవతారము బొమ్మను ఎంచుకోబడినటువంటి ఆఖరి డైరెక్టరి."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The position for the chat window side pane"
 msgstr "చాట్ విండో స్థానము పక్కపట్టీ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The stored position (in pixels) of the chat window side pane."
-msgstr ""
+msgstr "మటామంతీ(చాట్) కిటికీ ప్రక్కన పలక నిలువ స్థానము(పిక్సెల్ లలో)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "చాట్ విండోలలోసంభాషణను ప్రదర్శించుటకు ఉపయోగించబడిన థీము."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-#, fuzzy
-#| msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
-msgstr "చాట్ విండోలలోసంభాషణను ప్రదర్శించుటకు ఉపయోగించబడిన థీము."
+msgstr "చాట్ విండోలలోసంభాషణను ప్రదర్శించుటకు మార్పులు చేయగలిగిన థీము."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid "Use graphical smileys"
 msgstr "గ్రాఫికల్ చిరునవ్వులను వాడు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use notification sounds"
 msgstr "ప్రకటిత శబ్దములను వాడు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use theme for chat rooms"
 msgstr "చాట్ గదుల కొరకు థీమును వాడు"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "వాడుకరి ఉన్న స్థానమును వారి పరిచయములకు ఎంపతి ప్రచురించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "స్థానమును అంచనావేయుటకు ఎంపతి GPSను ఉపయోగించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "స్థానమును అంచనావేయుటకు ఎంపతి సెల్యులర్ నెట్‌వర్కును ఉపయోగించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "స్థానమును అంచనావేయుటకు ఎంపతి నెట్‌వర్కును ఉపయోగించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy has migrated butterfly logs."
-msgstr ""
+msgstr "అభివృధ్ధి చెందిన సీతాకోక చిలుక లాగ్ లు ఎంపతి కలిగి వున్నది"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr ""
-"ఎంపతి వ్యవస్థ ప్రారంభములో మీ ఖాతాలలోనికి స్వయంచాలకంగా ప్రవేశించాలా వద్దా."
+msgstr "ఎంపతి వ్యవస్థ ప్రారంభములో మీ ఖాతాలలోనికి స్వయంచాలకంగా ప్రవేశించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ఒకవేళ వాడుకరి వాడకుండా ఉంటే ఎంపతిని స్వయంచాలకంగా దూరంగా ఉన్న విధములోనికి "
-"మార్చాలా వద్దా."
+msgstr "ఒకవేళ వాడుకరి వాడకుండా ఉంటే ఎంపతిని స్వయంచాలకంగా దూరంగా ఉన్న విధములోనికి మార్చాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"గోప్యతా కారణాల దృష్ట్యా స్థానము యొక్క ఖచ్చితత్వాన్ని ఎంపతి తగ్గించాలా వద్దా."
+msgstr "గోప్యతా కారణాల దృష్ట్యా స్థానము యొక్క ఖచ్చితత్వాన్ని ఎంపతి తగ్గించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "ఎంపతి పరిచయము యొక్క అవతారమును చాట్ విండో ప్రతీక వలె ఉపయోగించాలా లేదా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "వెబ్ ఇన్‌స్పెక్టర్ వంటి వెబ్‌కిట్ డెవలపర్ సాధనములు చేతనము చేయవలెనా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"స్వయంచాలకంగా అననుసంధానించుటకు/మళ్ళీ అనుసంధానించుటకు అనుసంధాన నిర్వాహకాలను "
-"ఉపయోగించాలా వద్దా."
+"స్వయంచాలకంగా అననుసంధానించుటకు/మళ్ళీ అనుసంధానించుటకు అనుసంధాన నిర్వాహకాలను ఉపయోగించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
-msgstr ""
-"మీరు పరిశీలించాలనుకున్న భాషలకు ప్రవేశపెట్టిన పదములను పరిశీలించాలా వద్దా."
+msgstr "మీరు పరిశీలించాలనుకున్న భాషలకు ప్రవేశపెట్టిన పదములను పరిశీలించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "సంభాషణలలో చిరునవ్వులను గ్రాఫికల్ బొమ్మలలోనికి మార్చాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "నాడీధ్వనులను క్రియాశీల పరుచుటకు, అతి ధ్వనుల నిరుపయోగ పరుచు ఫిల్టరు"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr ""
-"నెట్‌వర్కులో ప్రవేశించినపుడు పరిచయములకు సూచించుటకు శబ్దము వినిపించాలా వద్దా."
+msgstr "నెట్‌వర్కులో ప్రవేశించినపుడు పరిచయములకు సూచించుటకు శబ్దము వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
-msgstr ""
-"నెట్‌వర్కు నుండి నిష్క్రమించినపుడు పరిచయములకు శబ్ధమును వినిపించాలా వద్దా."
+msgstr "నెట్‌వర్కు నుండి నిష్క్రమించినపుడు పరిచయములకు శబ్ధమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "ఘటనలను తెలియజేయుటకు శబ్దమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "లోనికివచ్చు సందేశములను తెలియజేయుటకు శబ్దమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "కొత్త సంభాషణలను తెలియచేయుటకు శబ్ధమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "బయటకువెళ్ళు సందేశములను తెలియచేయుటకు శబ్దమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "నెట్‌వర్కునందు ప్రవేశించినపుడు శబ్దమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "నెట్‌వర్కు నుండి నిష్క్రమించునపుడు శబ్దమును వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "దూరంగావున్నప్పుడు లేదా తీరికలేనపుడు శబ్ద ప్రకటనలను వినిపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ఒక పరిచయం ఆఫ్‌లైన్‌కు వెళ్ళినప్పుడు పైకివచ్చు ప్రకటనను చూపాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ఒక పరిచయం ఆన్‌లైన్‌కు వచ్చినప్పుడు పైకివచ్చు ప్రకటన చూపాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"ఒకవేళ చాట్ ఇదివరకే తెరిచివుండి, దృష్టి సారించకపోతే, ఒక కొత్త సందేశము "
-"వచ్చినప్పుడు పైకివచ్చు ప్రకటనను "
+"ఒకవేళ చాట్ ఇదివరకే తెరిచివుండి, దృష్టి సారించకపోతే, ఒక కొత్త సందేశము వచ్చినప్పుడు పైకివచ్చు ప్రకటనను "
 "చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ఒక కొత్త సందేశము వచ్చినప్పుడు పైకివచ్చు ప్రకటనని చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show account balances in the contact list."
 msgstr "పరిచయ జాబితానందు ఖాతా సమతుల్యతను చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"చాట్ విండోలు మరియు పరిచయ జాబితాలలో పరిచయముల కోసం అవతారములను చూపించాలా వద్దా."
+msgstr "చాట్ విండోలు మరియు పరిచయ జాబితాలలో పరిచయముల కోసం అవతారములను చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "పరిచయ జాబితా నందు ఆఫ్‌లైనులో ఉన్న పరిచయాలను చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show popup notifications when away or busy."
 msgstr "దూరంగా లేదా తీరికలేనపుడు పైకివచ్చు ప్రకటనలను చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "పరిచయ జాబితాలో పరిచయముల కొరకు ప్రోటోకాల్సును చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show the contact list in chat rooms."
 msgstr "చాట్ గదులలో పరిచయ జాబితాను చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show the contact list in compact mode."
 msgstr "పరిచయ జాబితాను కాంపాక్టు విధములో చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr ""
-"ప్రధాన విండోను శీర్షిక పట్టీనందు 'x' బటన్‌తో మూసివేయునపుడు సందేశపు డైలాగ్ "
-"చూపించాలా వద్దా."
+msgstr "ప్రధాన విండోను శీర్షిక పట్టీనందు 'x' బటన్‌తో మూసివేయునపుడు సందేశపు డైలాగ్ చూపించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to use the theme for chat rooms."
 msgstr "చాట్ గదుల కొరకు థీమును ఉపయోగించాలా వద్దా."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 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."
 msgstr ""
-"పరిచయ జాబితాను క్రమబద్దీకరిస్తున్నప్పుడు ఏ విధానాన్ని ఉపయోగించాలి. పరిచయాల "
-"పేరును \"name\" విలువతో "
-"ఉపయోగించి క్రమబద్దీకరించుట అప్రమేయం. విలువ \"state\" అనునది పరిచయ జాబితాను "
-"స్థితిని బట్టి "
+"పరిచయ జాబితాను క్రమబద్దీకరిస్తున్నప్పుడు ఏ విధానాన్ని ఉపయోగించాలి. పరిచయాల పేరును \"name\" విలువతో "
+"ఉపయోగించి క్రమబద్దీకరించుట అప్రమేయం. విలువ \"state\" అనునది పరిచయ జాబితాను స్థితిని బట్టి "
 "క్రమబద్దీకరిస్తుంది."
 
 #: ../data/empathy-accounts.desktop.in.in.h:1
@@ -486,35 +495,31 @@ msgstr "సందేశకము మరియు VoIP ఖాతాలు"
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ఫైల్ బదిలీ పూర్తయినది, కాని ఫైల్ పాడైనది"
 
-#: ../libempathy/empathy-ft-handler.c:1113
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "ఫైల్ బదిలీ దూరస్థ పరిచయం ద్వారా సహకరించబడుటలేదు"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is not a regular file"
 msgstr "ఎంచుకున్న ఫైల్ సాధారణ ఫైల్ కాదు"
 
-#: ../libempathy/empathy-ft-handler.c:1178
+#: ../libempathy/empathy-ft-handler.c:1176
 msgid "The selected file is empty"
 msgstr "ఎంచుకున్న ఫైల్ ఖాళీది"
 
-#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s నుండి మిస్సుడ్ కాల్ వచ్చింది"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:346
-#, fuzzy, c-format
-#| msgid "Call with %s"
+#: ../libempathy/empathy-message.c:419
 msgid "Called %s"
-msgstr "%sతో కాల్ చేయి"
+msgstr "%s పిలవబడినది"
 
-#: ../libempathy/empathy-message.c:349
-#, fuzzy, c-format
-#| msgid "Missed call from %s"
+#: ../libempathy/empathy-message.c:422
 msgid "Call from %s"
-msgstr "%s నుండి మిస్సుడ్ కాల్ వచ్చింది"
+msgstr "%s నుపిలువుము"
 
 #: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
@@ -544,162 +549,161 @@ msgstr "ఫైలును బదిలీచేయుటకు ప్రయత�
 msgid "The other participant is unable to transfer the file"
 msgstr "పాల్గొన్న ఇతరులు ఫైల్ బదిలీచేయలేకపోతున్నారు"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "తెలియని కారణం"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "అందుబాటులోవున్నాను"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "తీరికలేదు"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "దూరంగా ఉన్నాను"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "అదృశ్యముగా ఉన్నాను"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "ఆఫ్‌లైనులో ఉన్నాను"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:244
 msgctxt "presence"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "ఏ కారణము తెలుపలేదు"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "స్థితి ఆఫ్‌లైన్‌కు అమర్చబడింది."
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
-#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "Network error"
 msgstr "నెట్‌వర్కు దోషము"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "ప్రామాణీకరణ విఫలమైంది"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "ఎన్‌క్రిప్షన్ దోషము"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "పేరు వాడుకలో ఉంది"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "ధృవీకరణపత్రం సమకూర్చబడలేదు"
 
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "ధృవీకరణపత్రం నమ్మలేనిది"
 
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "ధృవీకరణపత్రం గడువు ముగిసినది"
 
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "ధృవీకరణపత్రాన్ని ఉత్తేజపరచలేదు"
 
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "ధృవీకరణపత్ర అతిథ్యపేరుతో సరిపోలడంలేదు"
 
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "ధృవీకరణపత్రం వేలిముద్ర సరిపోలడంలేదు"
 
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "ధృవీకరణపత్రం స్వంతగా-సంతకం చేసినది"
 
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "ధృవీకరణపత్ర దోషము"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "ఎన్‌క్రిప్షన్ అందుబాటులో లేదు"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "ధృవీకరణపత్రం చెల్లనిది"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:348
 msgid "Connection has been refused"
 msgstr "అనుసంధానము తిరస్కరించబడింది"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "అనుసంధానమును స్థాపించలేకపోయింది"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "అనుసంధానమును కోల్పోయింది"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:354
 msgid "This resource is already connected to the server"
 msgstr "ఈ వనరు ఇంతకుముందే సేవకానికి అనుసంధానించబడింది"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:356
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr ""
-"అనుసంధానము అదే వనరుని ఉపయోగించుకుని ఒక కొత్త అనుసంధానముచే పునఃస్థాపించబడింది"
+msgstr "అనుసంధానము అదే వనరుని ఉపయోగించుకుని ఒక కొత్త అనుసంధానముచే పునఃస్థాపించబడింది"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "సేవకములో ఈ ఖాతా ఇదివరకే ఉన్నది"
 
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "అనుసంధానమును నిర్వహించుటకు సేవకానికి ప్రస్తుతము తీరికలేదు"
 
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:363
 msgid "Certificate has been revoked"
 msgstr "దృవీకరణపత్రం తొలగించబడింది"
 
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:365
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"సురక్షితముకాని సైఫర్ అల్గారిథమ్ లేదా క్రిప్టోగ్రాఫికల్లీ బలహీనమైన "
-"ధృవీకరణపత్రాన్ని వాడుతుంది"
+msgstr "సురక్షితముకాని సైఫర్ అల్గారిథమ్ లేదా క్రిప్టోగ్రాఫికల్లీ బలహీనమైన ధృవీకరణపత్రాన్ని వాడుతుంది"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../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"
 msgstr ""
+"సర్వర్ సర్టిఫికెట్, లేదా సర్వర్ సర్టిఫికేట్ శ్రేణి లోతైన యొక్క పొడవు, గూఢ లైబ్రరీ ద్వారా విధించబడిన పరిమితులను "
+"దాటకుండా"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:529
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "దగ్గరలోని వ్యక్తులు"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:534
 msgid "Yahoo! Japan"
 msgstr "యాహూ! జపాన్"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:563
 msgid "Google Talk"
 msgstr "గూగుల్ టాక్"
 
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:564
 msgid "Facebook Chat"
 msgstr "ఫేస్‌బుక్ చాట్"
 
@@ -749,72 +753,79 @@ msgstr[1] "%d నెలల క్రితం"
 msgid "in the future"
 msgstr "భవిష్యత్తులో"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
-#, fuzzy
-#| msgid "Accounts"
+#: ../libempathy-gtk/empathy-account-chooser.c:540
 msgid "All accounts"
-msgstr "ఖాతాలు"
+msgstr "ఖాతాలు అన్నియు"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget.c:694
 #: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "ఖాతా"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:695
 msgid "Password"
 msgstr "సంకేతపదం"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:696
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "సేవకము"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:697
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "పోర్టు"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../libempathy-gtk/empathy-account-widget.c:769
+#: ../libempathy-gtk/empathy-account-widget.c:826
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1154
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "%s అనే ఖాతా నా వెబ్ ఖాతాల ద్వారా సవరించబడింది."
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "My Web Accounts"
+msgstr "నా వెబ్ ఖాతాలు"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1160
+#: ../libempathy-gtk/empathy-account-widget.c:1209
+msgid "The account %s is edited via %s."
+msgstr "%s అనే ఖాతా,%s ద్వారా సవరించబడింది."
+
+#: ../libempathy-gtk/empathy-account-widget.c:1215
 #, c-format
 msgid "The account %s cannot be edited in Empathy."
 msgstr "%s ఖాతాను ఎంపతిలో సవరించుట వీలుకాదు."
 
-#: ../libempathy-gtk/empathy-account-widget.c:1180
+#: ../libempathy-gtk/empathy-account-widget.c:1234
 msgid "Launch My Web Accounts"
 msgstr "నా వెబ్ ఖాతాలను ప్రారంభించు"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#. general handler
+#: ../libempathy-gtk/empathy-account-widget.c:1242
+msgid "Edit %s"
+msgstr "సవరణ "
+
+#: ../libempathy-gtk/empathy-account-widget.c:1592
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "వాడుకరి పేరు:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1910
 msgid "A_pply"
 msgstr "అనువర్తించు (_p)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1940
 msgid "L_og in"
 msgstr "ప్రవేశించు (_J)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:2014
 msgid "This account already exists on the server"
 msgstr "సేవకములో ఈ ఖాతా ఇంతకుముందే ఉన్నది"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:2017
 msgid "Create a new account on the server"
 msgstr "ఈ సేవకము పై ఒక కొత్త ఖాతాను సృష్టించు"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
+#: ../libempathy-gtk/empathy-account-widget.c:2209
 msgid "Ca_ncel"
 msgstr "రద్దుచేయి (_n)"
 
@@ -823,19 +834,19 @@ msgstr "రద్దుచేయి (_n)"
 #. * 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2487
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s పై %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2513
 #, c-format
 msgid "%s Account"
 msgstr "%s ఖాతా"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2517
 msgid "New account"
 msgstr "కొత్త ఖాతా"
 
@@ -847,6 +858,7 @@ msgstr "<b>ఉదాహరణ:</b> నా తెరపేరు"
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
@@ -956,76 +968,84 @@ msgstr "మీ ICQ UIN ఏమిటి?"
 msgid "What is your ICQ password?"
 msgstr "మీ ICQ సంకేతపదము ఏమిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "స్వయం"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../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:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "నమోదుచేసుకొను"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "ఐచ్ఛికాలు"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "ఏదీకాదు"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Character set:"
 msgstr "అక్షర సమితి:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr ""
+"చాలా IRC సర్వర్లు మీరు భావిస్తున్నారా కాదు మీరు కనుక, ఒక పాస్వర్డ్ను ఎంటర్ చేయకండి, పాస్వర్డ్ అవసరం "
+"లేదు."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Network"
 msgstr "నెట్ వర్క్"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Network:"
 msgstr "నెట్‌వర్కు:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "మారుపేరు:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "సంకేతపదం:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "నిష్క్రమణ సందేశం:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "అసలు పేరు:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Servers"
 msgstr "సేవకాలు"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "What is your IRC nickname?"
 msgstr "మీ IRC మారుపేరు ఏమిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "ఏ IRC నెట్‌వర్క్?"
 
@@ -1067,8 +1087,7 @@ msgid ""
 msgstr ""
 "ఇది మీ వాడుకరిపేరు, మీ సాధారణ ఫేస్‌బుక్ ప్రవేశం కాదు.\n"
 "ఒకవేళ మీరు facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"మీకు ఒకవేళ ఒక ఫేస్‌బుక్ వాడుకరిపేరు లేకుంటే <a href=\"http://www.facebook."
-"com/username/"
+"మీకు ఒకవేళ ఒక ఫేస్‌బుక్ వాడుకరిపేరు లేకుంటే <a href=\"http://www.facebook.com/username/"
 "\">ఈ పేజీని</a> వాడి ఒకటి సృష్టించండి."
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
@@ -1133,7 +1152,7 @@ msgstr "మొదటి పేరు (_F):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
-msgstr "జబ్బర్ ఐడి (_J):"
+msgstr "జాబ్బర్ ఐడి (_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
@@ -1169,23 +1188,23 @@ msgstr "విరామం (సెకన్లలో)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Keep-Alive Options"
-msgstr ""
+msgstr "ఇచ్ఛాపూర్వకాలను అలాగే వుంచండి"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Loose Routing"
-msgstr ""
+msgstr "దారిమళ్ళింపును వదిలివేయండి"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Mechanism:"
-msgstr ""
+msgstr "యాంత్రిక తత్వం:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Miscellaneous Options"
-msgstr ""
+msgstr "బహువిధాలైన ఇచ్ఛాపూర్వకాలు"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 msgid "NAT Traversal Options"
-msgstr ""
+msgstr "NAT ట్రావెర్సల్ ఐచ్ఛికాలు"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Port:"
@@ -1209,14 +1228,18 @@ msgid "Transport:"
 msgstr "ట్రాన్స్‍పోర్ట్:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "లండులింస్ మరియు మొబైల్ ఫోన్లు కాల్ ఈ ఖాతాను ఉపయోగించండి"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP account password?"
 msgstr "మీ SIP ఖాతా సంకేతపదం ఏమిటి?"
 
-#: ../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 "మీ SIP ప్రవేశ ఐడి ఏమిటి?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "_Username:"
 msgstr "వాడుకరిపేరు (_U):"
 
@@ -1240,36 +1263,37 @@ msgstr "యాహూ! ఐడి (_D):"
 msgid "_Room List locale:"
 msgstr "గది జాబితా స్థానికం (_R):"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "బొమ్మను మార్చలేకపోయింది"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "మీ వ్యవస్థ నందు ఆమోదించిన ఏ బొమ్మ ఫార్మేట్లు సహకరించుటలేదు"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "pixbuf నుండి png కి భద్రపరుచవద్దు"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "దస్రం లొని చిత్రాన్ని  భద్రపరుచ వద్దు  "
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "మీ అవతారము బొమ్మను ఎంచుకోండి"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "ఒక చిత్రాన్ని తీయండి..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "బొమ్మ లేదు"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "బొమ్మలు"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "అన్ని ఫైళ్ళు"
 
@@ -1277,104 +1301,101 @@ msgstr "అన్ని ఫైళ్ళు"
 msgid "Click to enlarge"
 msgstr "పెద్దదిచేయుటకు నొక్కండి"
 
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:60
 #| msgid "There was an error while creating the account."
 msgid "There was an error starting the call"
-msgstr "ఖాతాను సృష్టించునప్పుడు అక్కడ ఒక దోషము వుంది."
+msgstr "కాల్ ప్రారంభములో ఒక దోషం ఉంది"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact doesn't support calls"
-msgstr ""
+msgstr "పేర్కొన్న సంప్రదించండి కాల్స్ మద్దతు ఇవ్వదు"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:53
 #| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "ఎంచుకున్న పరిచయము ఆఫ్‌లైనులో ఉంది."
+msgstr "పేర్కొన్న పరిచయము ఆఫ్‌లైనులో ఉంది."
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:55
 #| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "ఎంచుకున్న పరిచయము ఆఫ్‌లైనులో ఉంది."
+msgstr "పేర్కొన్న సంప్రదించండి చెల్లుబాటులో లేదు"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:57
 #| msgid "Topic not supported on this conversation"
 msgid "Emergency calls are not supported on this protocol"
-msgstr "ఈ సంభాషణ పై విషయము సహకరించుట లేదు"
+msgstr " అత్యవసర కాల్స్ ఈ నియమావళి మద్దతు లేదు"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-chat.c:704
 msgid "Failed to open private chat"
 msgstr "రహస్య చాట్‌ని తెరుచుటలో విఫలమైంది"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:765
 msgid "Topic not supported on this conversation"
 msgstr "ఈ సంభాషణ పై విషయము సహకరించుట లేదు"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:771
 msgid "You are not allowed to change the topic"
 msgstr "విషయమును మార్చుటకు మీరు అనుమతించబడరు"
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:975
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "“%s” అనేది చెల్లని పరిచయపు ఐడి"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ప్రస్తుత సంభాషణలోని అన్ని సందేశాలను తుడిచివేయి"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: ప్రస్తుత సంభాషణ యొక్క విషయమును అమర్చు"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ఒక కొత్త చాట్ గదిలో చేరు"
 
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ఒక కొత్త చాట్ గదిలో చేరు"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
-"/part [<chat room ID>] [<reason>]: ప్రస్తుతపు దానితో అప్రమేయముగా చాట్ గదిని "
-"వదిలివెళ్ళు"
+"/part [<chat room ID>] [<reason>]: ప్రస్తుతపు దానితో అప్రమేయముగా చాట్ గదిని వదిలివెళ్ళు"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ఒక గోప్య చాట్‌ని తెరువు"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ఒక గోప్య చాట్‌ని తెరువు"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ప్రస్తుత సేవకములో మీ మారుపేరుని మార్చు"
 
-#: ../libempathy-gtk/empathy-chat.c:1049
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr ""
+msgstr "/me <message>:ప్రస్తుత సంభాషణకు ఒక ACTION సందేశాన్ని పంపేందుకు"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
+"/say <message> : ప్రస్తుత సంభాషణకు <message> పంపండి. ఈ ఒక '/' తో మొదలయ్యే ఒక సందేశాన్ని "
+"పంపడానికి ఉపయోగిస్తారు. ఉదాహరణకు: \"/ చేరడానికి / చెప్పే ఒక కొత్త చాట్ రూమ్ చేరడానికి ఉపయోగిస్తారు\""
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
-msgstr ""
+msgstr "/ WHOIS <contact ID>: ఒక పరిచయాన్ని గురించి ప్రదర్శన సమాచారం"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1382,113 +1403,113 @@ msgstr ""
 "/help [<command>]: సహకారము ఉన్న అన్ని ఆదేశాలను చూపిస్తుంది. ఒకవేళ <command> "
 "నిర్వచించబడినట్టయితే, దాని వాడుకని చూపించు."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1114
 #, c-format
 msgid "Usage: %s"
 msgstr "వాడుక: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "Unknown command"
 msgstr "తెలియని ఆదేశము"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1285
 msgid "Unknown command; see /help for the available commands"
 msgstr "తెలియని ఆదేశము; అందుబాటులోవున్న ఆదేశముల కోసం /help చూడండి"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1455
 msgid "insufficient balance to send message"
 msgstr "సందేశం పంపుటకు కావలసిన బ్యాలెన్స్ లేదు"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1457
 msgid "not capable"
-msgstr ""
+msgstr "సామర్ధ్యాన్ని కలిగి లేదు"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1464
 msgid "offline"
 msgstr "ఆఫ్‌లైన్"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1467
 msgid "invalid contact"
 msgstr "చెల్లని పరిచయం"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1470
 msgid "permission denied"
 msgstr "అనుమతి నిరాకరించబడింది"
 
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1473
 msgid "too long message"
 msgstr "మరీ పొడవైన సందేశము"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1476
 msgid "not implemented"
 msgstr "అమలుపరుచబడలేదు"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1480
 msgid "unknown"
 msgstr "తెలియదు"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
+#: ../libempathy-gtk/empathy-chat.c:1486
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' సందేశం పంపుటలో దోషము: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1428
+#: ../libempathy-gtk/empathy-chat.c:1490
 #, c-format
 msgid "Error sending message: %s"
 msgstr "సందేశం పంపడంలో దోషము: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
 msgid "Topic:"
 msgstr "విషయం:"
 
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1563
 #, c-format
 msgid "Topic set to: %s"
 msgstr "విషయం దీనికి అమర్చబడింది: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "No topic defined"
 msgstr "ఏ విషయం నిర్వచించిలేదు"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "(No Suggestions)"
 msgstr "(ఏ సూచనలు లేవు)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2142
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s'ని నిఘంటువుకి చేర్చు"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2179
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s'ని %s నిఘంటువుకి చేర్చు"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2249
 msgid "Insert Smiley"
 msgstr "చిరునవ్వును చేర్చు"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2267
+#: ../libempathy-gtk/empathy-ui-utils.c:1839
 msgid "_Send"
 msgstr "పంపు (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2321
 msgid "_Spelling Suggestions"
 msgstr "అక్షరక్రమం సూచనలు (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2410
 msgid "Failed to retrieve recent logs"
 msgstr "ఇటీవలి చిట్టాలను పొందుటలో విఫలమైంది"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2547
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s అననుసంధానించారు"
@@ -1496,12 +1517,12 @@ msgstr "%s అననుసంధానించారు"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2432
+#: ../libempathy-gtk/empathy-chat.c:2554
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s అనునది %2$s చేత బయటకు తోసివేయబడ్డారు"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2557
 #, c-format
 msgid "%s was kicked"
 msgstr "%s తోసివేయబడ్డారు"
@@ -1509,17 +1530,17 @@ msgstr "%s తోసివేయబడ్డారు"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2443
+#: ../libempathy-gtk/empathy-chat.c:2565
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s అనువారు %2$s చేత నిషేధించబడ్డారు"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2568
 #, c-format
 msgid "%s was banned"
 msgstr "%s నిషేధించబడ్డారు"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2572
 #, c-format
 msgid "%s has left the room"
 msgstr "%s గదిని వదిలివెళ్ళారు"
@@ -1529,117 +1550,133 @@ msgstr "%s గదిని వదిలివెళ్ళారు"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2459
+#: ../libempathy-gtk/empathy-chat.c:2581
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2606
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s గదిలో చేరారు"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2631
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ఇప్పుడు %s వలె అయినారు"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869
+#. 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:2784
+#: ../src/empathy-streamed-media-window.c:1894
+#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
+#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
 msgid "Disconnected"
 msgstr "అననుసంధానించబడ్డారు"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3428
 msgid "Would you like to store this password?"
 msgstr "ఈ సంకేతపదమును భద్రపరచాలనుకుంటున్నారా?"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3434
 msgid "Remember"
 msgstr "గుర్తించుకొను"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3444
 msgid "Not now"
 msgstr "ఇప్పుడు కాదు"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3488
 msgid "Retry"
 msgstr "మరలా ప్రయత్నించు"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3492
 msgid "Wrong password; please try again:"
 msgstr "సంకేతపదం తప్పు; దయచేసి మళ్ళీ ప్రయత్నించండి:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3622
 msgid "This room is protected by a password:"
 msgstr "ఈ గది సంకేతపదముతో రక్షణ కలిగివుంది:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3649
 msgid "Join"
 msgstr "చేరు"
 
-#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
 msgid "Connected"
 msgstr "అనుసంధానించబడ్డారు"
 
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:3906
 msgid "Conversation"
 msgstr "సంభాషణ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:3911
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
 msgid "Unknown or invalid identifier"
 msgstr "తెలియని లేదా చెల్లని గుర్తింపకం"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
 msgid "Contact blocking temporarily unavailable"
 msgstr "పరిచయాన్ని నిరోధించుట తాత్కాలికంగా అందుబాటులోలేదు"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
 msgid "Contact blocking unavailable"
 msgstr "పరిచయాన్ని నిరోధించుట అందుబాటులోలేదు"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
 msgid "Permission Denied"
 msgstr "అనుమతి నిరాకరించబడింది"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
 msgid "Could not block contact"
 msgstr "పరిచయాన్ని నిరోధించలేకపోతుంది"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
 msgid "Edit Blocked Contacts"
 msgstr "నిరోధించబడిన పరిచయాలను సవరించు"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
+#: ../libempathy-gtk/empathy-individual-widget.c:1489
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "ఖాతా:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "నిరోధించబడిన సంపర్కాలు"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "తీసివేయి "
+
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "లింకు చిరునామాను నకలుతీయు (_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "లింకును తెరువు (_O)"
 
@@ -1670,18 +1707,18 @@ msgid "Block %s?"
 msgstr "%s నిరోధించాలా?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-individual-dialogs.c:255
 #, c-format
 msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
+msgstr "మీరు మళ్ళీ మీరు సంప్రదించడం నుండి '% s' బ్లాక్ ఖచ్చితంగా?"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-individual-dialogs.c:277
 msgid "_Block"
 msgstr "నిరోధించు (_B)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../libempathy-gtk/empathy-individual-dialogs.c:286
 msgid "_Report this contact as abusive"
 msgid_plural "_Report these contacts as abusive"
 msgstr[0] "ఈ పరిచయము దుర్వినియోగాన్ని నివేదించు (_R)"
@@ -1701,44 +1738,44 @@ msgstr "వాడుకరిని నిరోధించు (_B)"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:71
 msgid "Ungrouped"
-msgstr ""
+msgstr "గుంపులో లేని"
 
 #: ../libempathy-gtk/empathy-contact-list-store.h:72
 msgid "Favorite People"
 msgstr "ఇష్టమైన వ్యక్తులు (_F)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "మీరు నిజంగా '%s' గుంపును తీసివేయాలనుకుంటున్నారా?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
+#: ../libempathy-gtk/empathy-contact-list-view.c:1988
+#: ../libempathy-gtk/empathy-individual-view.c:2379
 msgid "Removing group"
 msgstr "గుంపును తీసివేస్తున్నది"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
+#: ../libempathy-gtk/empathy-contact-list-view.c:2037
+#: ../libempathy-gtk/empathy-contact-list-view.c:2114
+#: ../libempathy-gtk/empathy-individual-view.c:2434
+#: ../libempathy-gtk/empathy-individual-view.c:2637
 msgid "_Remove"
 msgstr "తీసివేయి (_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
+#: ../libempathy-gtk/empathy-individual-view.c:2501
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "మీరు నిజంగానే '%s' పరిచయాన్ని తీసివేయాలనుకుంటున్నారా?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
+#: ../libempathy-gtk/empathy-contact-list-view.c:2069
+#: ../libempathy-gtk/empathy-individual-view.c:2522
 msgid "Removing contact"
 msgstr "పరిచయాన్ని తీసివేస్తున్నది"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "పరిచయాన్ని జతచేయి...(_A)"
 
@@ -1747,48 +1784,48 @@ msgid "_Block Contact"
 msgstr "పరిచయాన్ని నిరోధించు (_B)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
-#: ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-individual-menu.c:758
+#: ../src/empathy-main-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "చాట్ (_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
+#: ../libempathy-gtk/empathy-individual-menu.c:849
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ఆడియో కాల్ (_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
+#: ../libempathy-gtk/empathy-individual-menu.c:894
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "వీడియో కాల్ (_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../src/empathy-main-window.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:947
+#: ../src/empathy-main-window-menubar.ui.h:27
 msgid "_Previous Conversations"
 msgstr "మునుపటి సంభాషణలు (_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
+#: ../libempathy-gtk/empathy-individual-menu.c:988
 msgid "Send File"
 msgstr "ఫైలును పంపు"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
+#: ../libempathy-gtk/empathy-individual-menu.c:1030
 msgid "Share My Desktop"
 msgstr "నా డెస్క్‍టాప్‌ను పంచుకొను"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
+#: ../libempathy-gtk/empathy-contact-widget.c:1887
+#: ../libempathy-gtk/empathy-individual-menu.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:1372
 msgid "Favorite"
 msgstr "ఇష్టాంశము"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
+#: ../libempathy-gtk/empathy-individual-menu.c:1093
 msgid "Infor_mation"
 msgstr "సమాచారము (_m)"
 
@@ -1798,33 +1835,41 @@ msgid "_Edit"
 msgstr "సవరణ (_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
-#: ../src/empathy-chat-window.c:1010
+#: ../libempathy-gtk/empathy-individual-menu.c:1284
+#: ../src/empathy-chat-window.c:1011
 msgid "Inviting you to this room"
 msgstr "మిమ్మల్ని ఈ గదికి ఆహ్వానిస్తున్నారు"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
+#: ../libempathy-gtk/empathy-individual-menu.c:1330
 msgid "_Invite to Chat Room"
 msgstr "చాట్ గదికి ఆహ్వానించు (_I)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
 msgid "Search contacts"
 msgstr "పరిచయాలను వెతుకు"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
 msgid "Search: "
 msgstr "వెతుకు: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
 msgid "_Add Contact"
 msgstr "పరిచయాన్ని జతచేయి...(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
 msgid "No contacts found"
 msgstr "ఏ పరిచయాలు కనపడలేదు"
 
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+msgid "Your message introducing yourself:"
+msgstr "మీ సందేశం మిమ్మల్ని  పరిచయం చెస్తుంది:"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+msgid "Please let me see when you're online. Thanks!"
+msgstr "మీరు ఆన్లైన్ ఉన్నప్పుడు నన్ను చూడండి తెలియచేయండి. ధన్యవాదాలు!"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "ఒక పరిచయాన్ని ఎంచుకొను"
@@ -1877,153 +1922,153 @@ msgstr "దూరంగా ఉన్నపుడు సందేశము:"
 msgid "Channels:"
 msgstr "ఛానళ్ళు:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:897
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Country ISO Code:"
 msgstr "దేశము ISO కోడు:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:899
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Country:"
 msgstr "దేశము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:901
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "State:"
 msgstr "రాష్ట్రము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:903
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "City:"
 msgstr "పట్టణము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:905
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Area:"
 msgstr "ప్రాంతము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:907
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Postal Code:"
 msgstr "పోస్టల్ కోడ్:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:909
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Street:"
 msgstr "వీధి:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:911
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Building:"
 msgstr "భవనము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:913
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Floor:"
 msgstr "అంతస్థు:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Room:"
 msgstr "గది:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Text:"
 msgstr "పాఠ్యము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Description:"
 msgstr "వివరణ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:921
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:923
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Accuracy Level:"
 msgstr "ఖచ్చితత్వ స్థాయి:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:925
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Error:"
 msgstr "దోషము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Vertical Error (meters):"
 msgstr "నిలువు దోషము (మీటర్లు):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:929
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Horizontal Error (meters):"
 msgstr "అడ్డ దోషము (మీటర్లు):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:931
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Speed:"
 msgstr "వేగము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:933
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Bearing:"
 msgstr "బేరింగ్:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:935
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Climb Speed:"
 msgstr "ఎక్కు వేగము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:937
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Last Updated on:"
 msgstr "చివరిగా నవీకరించబడింది:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:939
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "Longitude:"
 msgstr "రేఖాంశము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:941
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Latitude:"
 msgstr "అక్షాంశము:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:943
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Altitude:"
 msgstr "ఎత్తు:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:996
+#: ../libempathy-gtk/empathy-contact-widget.c:1011
+#: ../libempathy-gtk/empathy-individual-widget.c:607
+#: ../libempathy-gtk/empathy-individual-widget.c:622
+#: ../src/empathy-preferences.ui.h:17
 msgid "Location"
 msgstr "స్థానము"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:1013
+#: ../libempathy-gtk/empathy-individual-widget.c:624
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:1065
+#: ../libempathy-gtk/empathy-individual-widget.c:673
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:1147
+#: ../libempathy-gtk/empathy-individual-widget.c:915
 msgid "Save Avatar"
 msgstr "అవతారాన్ని భద్రపరుచు"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1203
+#: ../libempathy-gtk/empathy-individual-widget.c:973
 msgid "Unable to save avatar"
 msgstr "అవతారాన్ని భద్రపరచలేకపోతుంది"
 
@@ -2033,7 +2078,7 @@ msgstr "<b>స్థానము</b> ఈ (తేది)వద్ద\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
+#: ../libempathy-gtk/empathy-individual-widget.c:1308
 msgid "Alias:"
 msgstr "అలియాస్:"
 
@@ -2053,7 +2098,7 @@ msgstr "పరిచయము వివరాలు"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-individual-widget.c:1517
 msgid "Identifier:"
 msgstr "గుర్తించునది:"
 
@@ -2079,8 +2124,7 @@ msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
-"గుంపులో కనిపించాలనుకుంటున్న పరిచయాన్ని ఎంచుకోండి.  మీరు ఒకటి కన్నా ఎక్కువ "
-"గుంపులను "
+"గుంపులో కనిపించాలనుకుంటున్న పరిచయాన్ని ఎంచుకోండి.  మీరు ఒకటి కన్నా ఎక్కువ గుంపులను "
 "ఎంచుకొనవచ్చు లేదా అస్సలు ఎంచుకొనపోవచ్చునని గమనించండి."
 
 #: ../libempathy-gtk/empathy-groups-widget.c:364
@@ -2093,17 +2137,17 @@ msgid "Select"
 msgstr "ఎంచుకోండి"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../src/empathy-main-window.c:1807
 msgid "Group"
 msgstr "గుంపు"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:260
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "కిందపేర్కొన్న గుర్తింపు నిరోధించబడును:"
 msgstr[1] "కిందపేర్కొన్న గుర్తింపులు నిరోధించబడును:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:267
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "కిందపేర్కొన్న గుర్తింపు నిరోధించబడదు:"
@@ -2129,41 +2173,69 @@ msgstr "జాబితాలో ఎడమవైపు ఎంచుకోబడ�
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:145
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:309
+msgid "Select account to use to place the call"
+msgstr "కాల్ స్థానానికి ఉపయోగించడానికి ఖాతా ఎంచుకోండి"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-streamed-media-window.c:1299
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call"
+msgstr "కాల్"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:378
+#| msgid "Provide"
+msgid "Mobile"
+msgstr "మొబైలు"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:380
+msgid "Work"
+msgstr "పని "
+
+#: ../libempathy-gtk/empathy-individual-menu.c:382
+msgid "HOME"
+msgstr "ఇల్లు "
+
 #. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:804
+#: ../libempathy-gtk/empathy-new-message-dialog.c:215
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:1142
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
+#: ../libempathy-gtk/empathy-individual-menu.c:1168
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contacts…"
 msgstr "పరిచయాలను లింకుచేయి...(_O)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 msgid "Delete and _Block"
 msgstr "తొలగించు మరియు నిరోధించు (_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2510
 #, 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 ""
+"మీరు నిజంగా లింక్ పరిచయం '% s' తొలగించడానికి అనుకుంటున్నారా? ఈ లింక్ సంప్రదించండి ను తయారుచేసే అన్ని "
+"పరిచయాలను తొలగిస్తుంది గమనించండి."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1656
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2218,7 +2290,7 @@ msgstr "అన్‌లింక్ చేయి...(_U)"
 #: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
+msgstr "పూర్తిగా ప్రత్యేక పరిచయాలను లోకి ప్రదర్శించబడే లింక్ పరిచయాలను విడిపోయారు."
 
 #. Add button
 #. Translators: this is an action button in the linking dialogue. "Link" is
@@ -2238,219 +2310,217 @@ msgid ""
 "Are you sure you want to unlink these linked contacts? This will completely "
 "split the linked contacts into separate contacts."
 msgstr ""
+"మీరు ఈ లింక్ పరిచయాలను లింక్ తొలగించడానికి నిశ్చయించుకున్నారా? ఈ పూర్తిగా ప్రత్యేక పరిచయాలను లోకి లింక్ "
+"పరిచయాలను స్ప్లిట్ ఉంటుంది."
 
 #: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "అన్‌లింక్ చేయి (_U)"
 
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-log-window.c:634
+msgid "History"
+msgstr "చరిత్ర"
+
+#: ../libempathy-gtk/empathy-log-window.c:689
 msgid "Show"
-msgstr ""
+msgstr "చూపించు"
 
-#: ../libempathy-gtk/empathy-log-window.c:527
+#: ../libempathy-gtk/empathy-log-window.c:711
 msgid "Search"
 msgstr "వెతుకు"
 
-#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1159
+msgid "Chat in %s"
+msgstr "%sతో  చాట్"
+
+#: ../libempathy-gtk/empathy-log-window.c:1161
+msgid "Chat with %s"
+msgstr "% S తో చాట్"
+
+#: ../libempathy-gtk/empathy-log-window.c:1211
+#: ../libempathy-gtk/empathy-log-window.c:1358
 #| msgid "%A %B %d %Y"
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%A %B %d %Y"
-
-#: ../libempathy-gtk/empathy-log-window.c:747
-#, fuzzy, c-format
-#| msgid "Call with %s"
-msgid "Chat with %s"
-msgstr "%sతో కాల్ చేయి"
+msgstr "%A %B %d %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:1300
 #, c-format
 msgid "<i>* %s %s</i>"
-msgstr ""
+msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:1306
 #, c-format
 msgid "<b>%s:</b> %s"
-msgstr ""
+msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1382
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s రెండవ "
+msgstr[1] "%d సెకనుల క్రితం"
 
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:1389
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%d నిముషము"
+msgstr[1] "%d నిముషాలు"
+
+#: ../libempathy-gtk/empathy-log-window.c:1397
 #, c-format
 msgid "Call took %s, ended at %s"
-msgstr ""
+msgstr "కాల్,% s పట్టింది% s వద్ద ముగిసింది"
 
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1729
 msgid "Today"
-msgstr ""
+msgstr "నేడు"
 
-#: ../libempathy-gtk/empathy-log-window.c:1217
-#, fuzzy
-#| msgid "Western"
+#: ../libempathy-gtk/empathy-log-window.c:1733
 msgid "Yesterday"
-msgstr "వెస్ట్రన్"
+msgstr "నిన్న"
 
-#: ../libempathy-gtk/empathy-log-window.c:1233
-#, fuzzy
-#| msgid "%A %B %d %Y"
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1748
 msgid "%e %B %Y"
-msgstr "%A %B %d %Y"
+msgstr "%A %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3444
 msgid "Anytime"
-msgstr ""
+msgstr "ఏ సమయములోనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2372
 #| msgid "None"
 msgid "Anyone"
-msgstr "ఏదీకాదు"
+msgstr "ఎవరైనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:2685
 msgid "Who"
-msgstr ""
+msgstr "ఎవరు"
 
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2889
 msgid "When"
-msgstr ""
+msgstr "ఎపుడు"
 
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:3005
 msgid "Anything"
-msgstr ""
+msgstr "ఏదైనా"
 
-#: ../libempathy-gtk/empathy-log-window.c:2274
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3007
 #| msgid "Set status"
 msgid "Text chats"
-msgstr "స్థితిని అమర్చు"
+msgstr "పాఠ్య చాట్లు"
 
-#: ../libempathy-gtk/empathy-log-window.c:2276
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../src/empathy-preferences.ui.h:4
 #| msgid "Call"
 msgid "Calls"
-msgstr "కాల్"
+msgstr "కాల్స్ "
 
-#: ../libempathy-gtk/empathy-log-window.c:2281
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3014
 #| msgid "Incoming call"
 msgid "Incoming calls"
-msgstr "లోనికివచ్చు కాల్"
+msgstr "లోనికివచ్చు కాల్స్"
 
-#: ../libempathy-gtk/empathy-log-window.c:2282
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3015
 #| msgid "Outgoing voice call"
 msgid "Outgoing calls"
-msgstr "బయటకు వెళ్ళు వాయిస్ కాల్"
+msgstr "బయటకు వెళ్ళు వాయిస్ కాల్స్"
 
-#: ../libempathy-gtk/empathy-log-window.c:2283
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3016
 #| msgid "Missed call from %s"
 msgid "Missed calls"
-msgstr "%s నుండి మిస్సుడ్ కాల్ వచ్చింది"
+msgstr "మిస్సుడ్ కాల్స్"
 
-#: ../libempathy-gtk/empathy-log-window.c:2304
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3038
 #| msgid "Chat"
 msgid "What"
-msgstr "చాట్"
+msgstr "ఏమిటి"
 
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:3747
 msgid "Are you sure you want to delete all logs of previous conversations?"
-msgstr ""
+msgstr "మీరు మునుపటి సంభాషణలు అన్ని లాగ్లను తొలగించడానికి నిశ్చయించుకున్నారా?"
 
-#: ../libempathy-gtk/empathy-log-window.c:2921
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3751
 #| msgid "C_lear"
 msgid "Clear All"
-msgstr "శుభ్రపరచు (_l)"
+msgstr "అన్న శుభ్రపరచు "
 
-#: ../libempathy-gtk/empathy-log-window.c:2928
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3758
 #| msgid "Connected from:"
 msgid "Delete from:"
-msgstr "దీని నుండి అనుసంధానించబడింది:"
+msgstr "దీని నుండి తొలగ్మిచు:"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-#: ../src/empathy-streamed-media-window.c:1340
-msgid "Call"
-msgstr "కాల్"
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\"> లోడ్ అవుతోంది ...</ span>ముత"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 #: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "చాట్"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "History"
-msgstr ""
-
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-#, fuzzy
+msgid "Delete All History..."
+msgstr "చరిత్ర అన్న  తొలగించు ."
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 #| msgid "Provide"
 msgid "Profile"
-msgstr "సమకూర్చు"
+msgstr "ప్రొఫైల్"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-call-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:22
+#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Video"
 msgstr "వీడియో"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:20
 msgid "_Edit"
 msgstr "సవరణ (_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:7
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
 #| msgid "File"
 msgid "_File"
-msgstr "ఫైల్"
+msgstr "ఫైల్ (_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:8
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
-msgstr ""
+msgstr "పేజీ 2"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
 msgstr "పరిచయము ఐడి:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
+#: ../libempathy-gtk/empathy-new-message-dialog.c:225
 msgid "C_hat"
 msgstr "చాట్ (_h)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:244
 msgid "New Conversation"
 msgstr "కొత్త సంభాషణ"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
+#: ../libempathy-gtk/empathy-new-call-dialog.c:204
 msgid "Send _Video"
 msgstr "వీడియోను పంపు (_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
+#: ../libempathy-gtk/empathy-new-call-dialog.c:215
 msgid "C_all"
 msgstr "కాల్ (_a)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
 msgid "New Call"
 msgstr "కొత్త కాల్"
 
@@ -2469,34 +2539,34 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "అనురూపిత సందేశము..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "అనురూపిత సందేశాలను సవరించు..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "ఈ స్థితిని ఇష్టాంశము నుండి తీసివేయుటకు నొక్కండి"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "ఈ స్థితిని ఇష్టాంశముగా చేయుటకు నొక్కండి"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "స్థితిని అమర్చు"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
+#: ../libempathy-gtk/empathy-presence-chooser.c:943
 msgid "Set your presence and current status"
 msgstr "మీ ఉనికిని మరియు ప్రస్తుత స్థితిని అమర్చండి"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1131
 msgid "Custom messages…"
 msgstr "అనురూపిత సందేశాలు..."
 
@@ -2510,24 +2580,27 @@ msgid "New %s account"
 msgstr "కొత్త %s ఖాతా"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "తరువాతది కనుగొను"
+msgid "Find:"
+msgstr "కనుగొను:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "మునుపటిది కనుగొను"
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "సరిపోలు సందర్భం (_c)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "కనుగొను:"
+msgid "Phrase not found"
+msgstr "పదబందం కనపడలేదు"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "సరిపోలు సందర్భం"
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "తరువాత (_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "Phrase not found"
-msgstr "పదబందం కనపడలేదు"
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "మునుపటి (_P)"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2569,45 +2642,39 @@ msgstr "బయటకు వెళ్ళు వాయిస్ కాల్"
 msgid "Voice call ended"
 msgstr "వాయిల్ కాల్ ముగిసినది"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "అనురూపిత సందేశమును ప్రవేశపెట్టు"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "అనురూపిత సందేశాలను సవరించు"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "కొత్త స్థితి సందేశాన్ని భద్రపరుచు (_N)"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "భద్రపరుచబడిన స్థితి సందేశాలు"
+#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "సందేశం% s వద్ద సవరించబడింది"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1726
 msgid "Normal"
 msgstr "సాధారణ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "శాస్త్రీయ"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "సరళమైన"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "శుభ్రముచేయి"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "నీలం"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
-msgstr ""
+msgstr "చాట్ సర్వర్ అందించిన గుర్తింపు ధ్రువీకరించబడదు."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:157
 msgid "The certificate is not signed by a Certification Authority."
@@ -2666,8 +2733,7 @@ msgstr "కొనసాగు"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr ""
-"అనుసంధానము నమ్మదగినది కాదు. ఏది ఏమైనప్పటికీ మీరు కొనసాగాలనుకుంటున్నారా?"
+msgstr "అనుసంధానము నమ్మదగినది కాదు. ఏది ఏమైనప్పటికీ మీరు కొనసాగాలనుకుంటున్నారా?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:297
 msgid "Remember this choice for future connections"
@@ -2677,29 +2743,28 @@ msgstr "మునుముందు అనుసంధానాలకు ఈ ఎ
 msgid "Certificate Details"
 msgstr "ధృవీకరణపత్రం వివరాలు"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1735
 msgid "Unable to open URI"
 msgstr "URI తెరువలేకపోతుంది"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1831
 msgid "Select a file"
 msgstr "ఒక ఫైల్‌ని ఎంచుకొను"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1903
 msgid "Insufficient free space to save file"
 msgstr "ఫైలును భద్రపరుచుటకు తగిన ఖాళీ స్థలము లేదు"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1911
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"ఈ ఫైలును భద్రపరుచుటకు %s ఖాళీ స్థలము అవసరము, కాని కేవలం %s మాత్రమే అందుబాటులో "
-"ఉన్నది. దయచేసి "
+"ఈ ఫైలును భద్రపరుచుటకు %s ఖాళీ స్థలము అవసరము, కాని కేవలం %s మాత్రమే అందుబాటులో ఉన్నది. దయచేసి "
 "వేరొక స్థానమును ఎన్నుకోండి."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s నుండి ఫైల్ లోనికివస్తున్నది"
@@ -2887,23 +2952,23 @@ msgstr "ఏ దోష సందేశము లేదు"
 msgid "Instant Message (Empathy)"
 msgstr "సత్వర సందేశం (ఎంపతి)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:431
 msgid "Don't connect on startup"
 msgstr "వ్యవస్థ ప్రారంభములో అనుసంధానించవద్దు"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:435
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "వ్యవస్థ ప్రారంభమయినపుడు పరిచయ జాబితా గాని లేక ఏ ఇతర డైలాగులను చూపవద్దు"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:450
 msgid "- Empathy IM Client"
 msgstr "- ఎంపతి IM క్లయింటు"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:637
 msgid "Error contacting the Account Manager"
 msgstr "ఖాతా నిర్వాహకాన్ని సంప్రదించుటలో దోషము"
 
-#: ../src/empathy.c:502
+#: ../src/empathy.c:639
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2911,6 +2976,9 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
+"టెలెపథ్య్  ఖాతా మేనేజర్ కనెక్ట్ చేసేటప్పుడు ఒక లోపం ఉంది. లోపం జరిగినది:\n"
+"\n"
+"% s"
 
 #: ../src/empathy-about-dialog.c:81
 msgid ""
@@ -2919,10 +2987,8 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"ఎంపతి అనేది ఒక ఉచిత సాఫ్ట్‍వేర్; దీనిని మీరు ఫ్రీ సాఫ్ట్‍వేర్ ఫౌండేషన్ "
-"ప్రచురించిన విధంగా గ్నూ జనరల్ పబ్లిక్ "
-"లైసెన్స్  నిబంధనలకు అనుగుణంగా పంచవచ్చు మరియు/లేదా సవరించవచ్చు; వెర్షన్ 2 "
-"లైసెన్స్, లేదా (మీ ఐచ్చికాన్ని "
+"ఎంపతి అనేది ఒక ఉచిత సాఫ్ట్‍వేర్; దీనిని మీరు ఫ్రీ సాఫ్ట్‍వేర్ ఫౌండేషన్ ప్రచురించిన విధంగా గ్నూ జనరల్ పబ్లిక్ "
+"లైసెన్స్  నిబంధనలకు అనుగుణంగా పంచవచ్చు మరియు/లేదా సవరించవచ్చు; వెర్షన్ 2 లైసెన్స్, లేదా (మీ ఐచ్చికాన్ని "
 "బట్టి) ఏదైనా తరువాత వెర్షన్."
 
 #: ../src/empathy-about-dialog.c:85
@@ -2932,10 +2998,8 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"ఎంపతి అనేది ఏ విధమైన పూచికత్తులు లేకుండా ఉపయోగపడుతుందనే నమ్మకంతో పంచబడుతుంది; "
-"వ్యాపారానికి గాని లేదా "
-"ఒక ఖచ్చితమైన ప్రయోజనానికి ఉపయోగించవచ్చని కనీసం భావించిన పూచికత్తులు కూడా "
-"లేకుండా ఇవ్వబడుతుంది.  "
+"ఎంపతి అనేది ఏ విధమైన పూచికత్తులు లేకుండా ఉపయోగపడుతుందనే నమ్మకంతో పంచబడుతుంది; వ్యాపారానికి గాని లేదా "
+"ఒక ఖచ్చితమైన ప్రయోజనానికి ఉపయోగించవచ్చని కనీసం భావించిన పూచికత్తులు కూడా లేకుండా ఇవ్వబడుతుంది.  "
 "మరిన్ని వివరాలకు గ్నూ జనరల్ పబ్లిక్ లైసెన్స్ చూడండి."
 
 #: ../src/empathy-about-dialog.c:89
@@ -2944,14 +3008,13 @@ msgid ""
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
-"మీరు ఎంపతితో పాటుగా గ్నూ జనరల్ పబ్లిక్ లైసెన్స్ యొక్క నకలు పొందివుండాలి; "
-"ఒకవేళ పొందకపోతే, Free "
-"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
-"1301 USA కి వ్రాయండి"
+"మీరు ఎంపతితో పాటుగా గ్నూ జనరల్ పబ్లిక్ లైసెన్స్ యొక్క నకలు పొందివుండాలి; ఒకవేళ పొందకపోతే, Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301 USA కి వ్రాయండి"
 
 #: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME కొరకు సత్వర సందేశక క్లయింటు"
+msgstr "గ్నోమ్ కొరకు సత్వర సందేశక క్లయింటు"
 
 #: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
@@ -2985,8 +3048,7 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
-"మీరు మీ ఖాతాల సమాచారమును ప్రవేశపెట్టుటకు మరలా వెనక్కువెళ్ళి ప్రయత్నించవచ్చు "
-"లేదా ఈ సహాయకాన్ని నిష్క్రమించి "
+"మీరు మీ ఖాతాల సమాచారమును ప్రవేశపెట్టుటకు మరలా వెనక్కువెళ్ళి ప్రయత్నించవచ్చు లేదా ఈ సహాయకాన్ని నిష్క్రమించి "
 "మరియు సవరణ మెనూ నుండి మీ ఖాతాలను తరువాత జతచేయండి."
 
 #: ../src/empathy-account-assistant.c:220
@@ -3025,10 +3087,8 @@ msgid ""
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"ఎంపతితో మీరు ఆన్‌లైనులో ఉన్న వ్యక్తులతో మాట్లాడవచ్చును మరియు గూగుల్ టాక్, "
-"AIM, విండోస్ లైవ్ వంటి ఇతర "
-"చాట్ ప్రోగ్రాములు ఉపయోగించే తోటివారితో మరియు స్నేహితులతో చాట్ చేయవచ్చు. "
-"మైక్రోఫోన్ లేదా వెబ్‌కామ్‌తో మీరు ఆడియో లేదా "
+"ఎంపతితో మీరు ఆన్‌లైనులో ఉన్న వ్యక్తులతో మాట్లాడవచ్చును మరియు గూగుల్ టాక్, AIM, విండోస్ లైవ్ వంటి ఇతర "
+"చాట్ ప్రోగ్రాములు ఉపయోగించే తోటివారితో మరియు స్నేహితులతో చాట్ చేయవచ్చు. మైక్రోఫోన్ లేదా వెబ్‌కామ్‌తో మీరు ఆడియో లేదా "
 "వీడియో కాల్సును కూడా చేయవచ్చు."
 
 #: ../src/empathy-account-assistant.c:629
@@ -3049,8 +3109,7 @@ msgstr "లేదు, నాకు ఒక కొత్త ఖాతా కావ
 
 #: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
-"లేదు, ఇప్పుడు కేవలం దగ్గరలోని ఆన్‌లైన్‌లోవున్న వ్యక్తులను చూడాలనుకుంటున్నాను"
+msgstr "లేదు, ఇప్పుడు కేవలం దగ్గరలోని ఆన్‌లైన్‌లోవున్న వ్యక్తులను చూడాలనుకుంటున్నాను"
 
 #: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
@@ -3073,6 +3132,9 @@ msgid ""
 "details below are correct. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
+"తాదాత్మ్యం స్వయంచాలకంగా కనుగొనడంలో మరియు మీరు అదే నెట్వర్క్ పై కనెక్ట్ ప్రజలు చాట్ చెయ్యవచ్చు. ను "
+"ఉపయోగించడానికి మీరు భావించినా, క్రింద వివరాలను సరైనవని తనిఖీ చెయ్యండి. మీరు సులభంగా 'అకౌంట్స్' డైలాగ్ "
+"ఉపయోగించి ఈ ఫీచర్ తరువాత ఈ వివరాలు మార్పు లేదా సాధ్యం చేసుకోవచ్చు"
 
 #: ../src/empathy-account-assistant.c:1091
 #: ../src/empathy-account-assistant.c:1147
@@ -3090,6 +3152,9 @@ msgid ""
 "install the telepathy-salut package and create a People Nearby account from "
 "the Accounts dialog"
 msgstr ""
+"మీరు telepathy-salut ఇన్స్టాల్ కాదు అని, మీ స్థానిక నెట్వర్కు అనుసంధానం ప్రజలు చాట్ చేయలేరు. మీరు "
+"ఈ లక్షణాలను సాధ్యం భావించినా, telepathy-salut ప్యాకేజీ ఇన్స్టాల్ దయచేసి మరియు అకౌంట్స్ డైలాగ్ నుండి ఒక "
+"పీపుల్ సమీపంలో ఖాతాని సృష్టించుకోండి"
 
 #: ../src/empathy-account-assistant.c:1149
 msgid "telepathy-salut not installed"
@@ -3125,7 +3190,8 @@ msgid "Your new account has not been saved yet."
 msgstr "మీ కొత్త ఖాతా ఇంకా భద్రపరుచబడలేదు."
 
 #: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-streamed-media-window.c:754
+#: ../src/empathy-call-window.c:1216
 msgid "Connecting…"
 msgstr "అనుసంధానిస్తున్నది..."
 
@@ -3194,10 +3260,9 @@ msgstr ""
 "మీరు కొనసాగాలనుకుంటున్నారా?"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-#, fuzzy
 #| msgid "_Add…"
 msgid "Add…"
-msgstr "జతచేయి...(_A)"
+msgstr "జతచేయి..."
 
 #: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Loading account information"
@@ -3211,19 +3276,12 @@ msgstr "ఏ ప్రోటోకాల్ స్థాపించబడిల�
 msgid "Protocol:"
 msgstr "ప్రోటోకాల్:"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-#, fuzzy
-#| msgid "_Remove"
-msgid "Remove"
-msgstr "తీసివేయి (_R)"
-
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"కొత్త ఖాతాను జతచేయుటకు, మీరు ఉపయోగించాలనుకుంటున్న ప్రతీ ప్రొటోకాల్‌కు మొదట "
-"బ్యాకెండ్‌ను స్థాపించాలి."
+"కొత్త ఖాతాను జతచేయుటకు, మీరు ఉపయోగించాలనుకుంటున్న ప్రతీ ప్రొటోకాల్‌కు మొదట బ్యాకెండ్‌ను స్థాపించాలి."
 
 #: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Import…"
@@ -3241,338 +3299,369 @@ msgstr "ఎంపతి ప్రామాణీకరణ క్లయింట�
 msgid "People nearby"
 msgstr "దగ్గరలోని ప్రజలు"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
 msgid "- Empathy Audio/Video Client"
 msgstr "- ఎంపతి ఆడియో/వీడియో క్లయింటు"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
 msgid "Empathy Audio/Video Client"
 msgstr "ఎంపతి ఆడియో/వీడియో క్లయింటు"
 
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
+#: ../src/empathy-streamed-media-window.c:431
 msgid "Contrast"
 msgstr "భేదము"
 
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Brightness"
 msgstr "ప్రకాశము"
 
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Gamma"
 msgstr "గామా"
 
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
+#: ../src/empathy-streamed-media-window.c:542
 msgid "Volume"
 msgstr "ధ్వనిస్థాయి"
 
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
+#: ../src/empathy-streamed-media-window.c:1110
 msgid "_Sidebar"
 msgstr "పక్క పట్టీ(_S)"
 
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
+#: ../src/empathy-streamed-media-window.c:1130
 msgid "Audio input"
 msgstr "ఆడియో ఇన్‌పుట్"
 
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
+#: ../src/empathy-streamed-media-window.c:1134
 msgid "Video input"
 msgstr "వీడియో ఇన్‌పుట్"
 
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Dialpad"
 msgstr "డయల్‌ప్యాడ్"
 
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
+#: ../src/empathy-streamed-media-window.c:1151
 msgid "Details"
 msgstr "వివరాలు"
 
 #. 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:1261
-#: ../src/empathy-call-window.c:1239
+#: ../src/empathy-streamed-media-window.c:1220
+#: ../src/empathy-call-window.c:1825
 #, c-format
 msgid "Call with %s"
 msgstr "%sతో కాల్ చేయి"
 
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-streamed-media-window.c:1453
+#: ../src/empathy-call-window.c:2069
 msgid "The IP address as seen by the machine"
 msgstr "యంత్రముతో చూడబడిన IP చిరునామా"
 
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
+#: ../src/empathy-streamed-media-window.c:1455
+#: ../src/empathy-call-window.c:2071
 msgid "The IP address as seen by a server on the Internet"
 msgstr "అంతర్జాలంతో ఒక సేవకముతో చూడబడిన IP చిరునామా"
 
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
+#: ../src/empathy-streamed-media-window.c:1457
+#: ../src/empathy-call-window.c:2073
 msgid "The IP address of the peer as seen by the other side"
-msgstr ""
+msgstr "ఇతర వైపు కనిపించే పీర్ యొక్క IP చిరునామా"
 
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
+#: ../src/empathy-streamed-media-window.c:1459
+#: ../src/empathy-call-window.c:2075
 msgid "The IP address of a relay server"
 msgstr "రిలే సేవకము యొక్క IP చిరునామా"
 
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
+#: ../src/empathy-streamed-media-window.c:1461
+#: ../src/empathy-call-window.c:2077
 msgid "The IP address of the multicast group"
 msgstr "బహుళప్రసార గుంపు యొక్క IP చిరునామా"
 
-#: ../src/empathy-streamed-media-window.c:1884
+#: ../src/empathy-streamed-media-window.c:1843
 msgctxt "encoding video codec"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/empathy-streamed-media-window.c:1887
+#: ../src/empathy-streamed-media-window.c:1846
 msgctxt "encoding audio codec"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/empathy-streamed-media-window.c:1890
+#: ../src/empathy-streamed-media-window.c:1849
 msgctxt "decoding video codec"
 msgid "Unknown"
 msgstr "తెలియదు"
 
-#: ../src/empathy-streamed-media-window.c:1893
+#: ../src/empathy-streamed-media-window.c:1852
 msgctxt "decoding audio codec"
 msgid "Unknown"
 msgstr "తెలియదు"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
+#: ../src/empathy-streamed-media-window.c:2144
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "అనుసంధానించబడింది — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
+#: ../src/empathy-streamed-media-window.c:2205
+#: ../src/empathy-call-window.c:2846
 msgid "Technical Details"
 msgstr "సాంకేతిక వివరాలు"
 
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:2884
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
-"మీ కంప్యూటరుచే సహకరించబడుతున్న ఏ ఆడియో ఫార్మేట్లను %s సాఫ్ట్‌వేర్ "
-"అర్థంచేసుకోలేకపోతున్నది"
+msgstr "మీ కంప్యూటరుచే సహకరించబడుతున్న ఏ ఆడియో ఫార్మేట్లను %s సాఫ్ట్‌వేర్ అర్థంచేసుకోలేకపోతున్నది"
 
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:2889
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "% s యొక్క సాఫ్ట్వేర్ మీ కంప్యూటర్ మద్దతు వీడియో ఫార్మాట్లలో అర్థం లేదు"
 
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:2895
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr ""
-"%s కి అనుసంధానమును స్థాపించలేకపోతున్నది. మీలో ఒకరు నేరుగా అనుసంధానమగుటకు "
-"అనుమతించని నెట్‌వర్క్ పై "
+"%s కి అనుసంధానమును స్థాపించలేకపోతున్నది. మీలో ఒకరు నేరుగా అనుసంధానమగుటకు అనుమతించని నెట్‌వర్క్ పై "
 "ఉండి వుండవచ్చును."
 
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
+#: ../src/empathy-streamed-media-window.c:2260
+#: ../src/empathy-call-window.c:2901
 msgid "There was a failure on the network"
 msgstr "నెట్‌వర్కు నందు వైఫల్యము ఉన్నది"
 
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
+#: ../src/empathy-streamed-media-window.c:2264
+#: ../src/empathy-call-window.c:2905
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "ఈ కాల్‌కి అవసరమైన ఆడియో ఫార్మేట్లు మీ కంప్యూటర్‌లో స్థాపించబడిలేవు"
 
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
+#: ../src/empathy-streamed-media-window.c:2267
+#: ../src/empathy-call-window.c:2908
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "ఈ కాల్‌కి అవసరమైన వీడియో ఫార్మేట్లు మీ కంప్యూటర్‌లో స్థాపించబడిలేవు"
 
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:2920
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
+"ఊహించని ఏదో ఒక Telepathy భాగం లో జరిగింది. దయచేసి <a href=\"%s\"> ఈ బగ్ నివేదిక </ a> మరియు "
+"సహాయం మెను లో 'డీబగ్' విండో నుండి సేకరించిన లాగ్లను అటాచ్."
 
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
+#: ../src/empathy-streamed-media-window.c:2285
+#: ../src/empathy-call-window.c:2929
 msgid "There was a failure in the call engine"
 msgstr "కాల్ ఇంజనులో ఒక వైఫల్యము ఉన్నది"
 
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
+#: ../src/empathy-streamed-media-window.c:2288
+#: ../src/empathy-call-window.c:2932
 msgid "The end of the stream was reached"
 msgstr "ప్రవాహము చివరకు చేరుకున్నది"
 
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
+#: ../src/empathy-streamed-media-window.c:2328
+#: ../src/empathy-call-window.c:2972
 msgid "Can't establish audio stream"
 msgstr "ఆడియో ప్రవాహాన్ని స్థాపించలేకపోతుంది"
 
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
+#: ../src/empathy-streamed-media-window.c:2338
+#: ../src/empathy-call-window.c:2982
 msgid "Can't establish video stream"
 msgstr "వీడియో ప్రవాహాన్ని స్థాపించలేకపోతుంది"
 
-#: ../src/empathy-call-window.ui.h:1
+#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "Audio"
 msgstr "ఆడియో"
 
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "పరిచయానికి మళ్ళీ కాల్ చేయి"
-
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "కెమెరా ఆపు"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "డీకోడింగ్ కొడెక్:"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "కెమెరా ఆన్ చేయి"
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "కెమెరా నిలిపివేయి"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "డీకోడింగ్ కొడెక్:"
+msgid "Display the dialpad"
+msgstr "డీల్పడ్  ప్రదర్శన"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "కెమెరాను అచేతనపరుచు మరియు వీడియోని పంపుట ఆపివేయి"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "ఎన్కోడింగ్ కొడెక్:"
 
 #: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "కెమెరాను చేతనపరిచి, వీడియోను పంపు"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Hang up"
+msgstr "హాంగ్ చేయి"
 
 #: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "కెమెరాను చేతనపరుచు కాని వీడియో పంపవద్దు"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Hang up current call"
+msgstr "ప్రస్తుత కాల్‌ని హాంగ్ చేయి"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ఎన్కోడింగ్ కొడెక్:"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "స్థానిక అభ్యర్ధి:"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "హాంగ్ చేయి"
+msgid "Maximise me"
+msgstr "నన్ను గరిష్టీకరించు"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ప్రస్తుత కాల్‌ని హాంగ్ చేయి"
+msgid "Minimise me"
+msgstr "నన్ను కనిష్టీకరించు"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "స్థానిక అభ్యర్ధి:"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "దూరస్థ అభ్యర్ధి:"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "మునుజూపు"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Send Audio"
+msgstr "ఆడియోను పంపు"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "తిరిగిడయిల్‌చేయి"
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "వీడియోను పంపు "
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "దూరస్థ అభ్యర్ధి:"
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "చుపు డీల్ప"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "ఆడియోను పంపు"
+msgid "Start a video call"
+msgstr "ఒక వీడియో కాల్ ప్రారంభండ్"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr ""
+msgid "Start an audio call"
+msgstr "ఒక ఆడియో కాల్ ప్రారంభం"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-call-window.c:1824
-#: ../src/empathy-call-window.c:1825 ../src/empathy-call-window.c:1826
-#: ../src/empathy-call-window.c:1827
-msgid "Unknown"
-msgstr "తెలియదు"
+#: ../src/empathy-call-window.ui.h:18
+msgid "Swap camera"
+msgstr "మార్పిడి కెమెరా"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "వీడియో (_i)"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "నొక్కండి ఆడియో ప్రసార"
 
-#: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "వీడియో ఆపు"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Toggle video transmission"
+msgstr "నొక్కండి వీడియో ప్రసార"
 
-#: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "వీడియో ఆన్‌చేయి"
+#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-streamed-media-window.ui.h:18
+#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
+#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
+msgid "Unknown"
+msgstr "తెలియదు"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "వీడియో మునుజూపు"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "వీడియో కాల్ "
 
 #: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "_Call"
 msgstr "కాల్ (_C)"
 
 #: ../src/empathy-call-window.ui.h:25
-#, fuzzy
-#| msgid "Dialpad"
-msgid "_Dialpad"
-msgstr "డయల్‌ప్యాడ్"
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "కెమెరా (_C)"
+
+#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:18
+msgid "_Contents"
+msgstr "విషయసూచిక (_C)"
+
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-main-window-menubar.ui.h:19
+msgid "_Debug"
+msgstr "డీబగ్ (_D)"
+
+#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-main-window-menubar.ui.h:22
+msgid "_Help"
+msgstr "సహాయం (_H)"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "_Microphone"
+msgstr "మైక్రోఫోను (_M)"
+
+#: ../src/empathy-call-window.ui.h:31
+#| msgid "Geoclue Settings"
+msgid "_Settings"
+msgstr "అమరికలు (_S)"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
+#: ../src/empathy-call-window.ui.h:32
+#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "వీక్షణం (_V)"
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d చదువనిది)"
 msgstr[1] "%s (%d చదువనివి)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:493
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (మరియు %u ఇతర)"
 msgstr[1] "%s (మరియు %u ఇతరాలు)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:509
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (%d ఇతరుల నుండి చదవనివి)"
 msgstr[1] "%s (%d ఇతరుల నుండి చదవనివి)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:518
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (%d అన్నిటిని నుండి చదవనివి)"
 msgstr[1] "%s (%d అన్నిటిని నుండి చదవనివి)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:733
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:743
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d సందేశమును పంపుతున్నది"
 msgstr[1] "%d సందేశాలను పంపుతున్నది"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:765
 msgid "Typing a message."
 msgstr "ఒక సందేశమును టైపు చేస్తున్నారు."
 
@@ -3604,10 +3693,6 @@ msgstr "ట్యాబ్‌ను కుడివైపుకు కదుప�
 msgid "Notify for All Messages"
 msgstr "అన్ని సందేశాలకూ తెలియజేయి"
 
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "విషయసూచిక (_C)"
-
 #: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "సంభాషణ (_C)"
@@ -3620,10 +3705,6 @@ msgstr "ట్యాబ్‌ను వేరుచేయి (_D)"
 msgid "_Favorite Chat Room"
 msgstr "ఇష్టమైన చాట్ గది (_F)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "సహాయం (_H)"
-
 #: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "తరువాత ట్యాబ్ (_N)"
@@ -3644,15 +3725,15 @@ msgstr "ట్యాబ్‌లు (_T)"
 msgid "_Undo Close Tab"
 msgstr "ట్యాబ్‌ని మూసివేయుట రద్దుచేయి (_U)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "పేరు"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "గది"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "స్వయం-అనుసంధానం"
 
@@ -3660,95 +3741,96 @@ msgstr "స్వయం-అనుసంధానం"
 msgid "Manage Favorite Rooms"
 msgstr "ఇష్టమైన గదులను నిర్వహించు"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:521
 msgid "Incoming video call"
 msgstr "లోనికివచ్చు వీడియో కాల్"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
 msgid "Incoming call"
 msgstr "లోనికివచ్చు కాల్"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:525
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s మీకు వీడియో కాల్ చేస్తున్నారు, మీరు సమాధానమివ్వాలనుకుంటున్నారా?"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s మీకు కాల్ చేస్తున్నారు. మీరు సమాధానమివ్వాలనుకుంటున్నారా?"
 
-#: ../src/empathy-event-manager.c:550 ../src/empathy-event-manager.c:751
-#: ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
+#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s నుండి లోనికి కాల్ వస్తున్నది"
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:554
 msgid "_Reject"
 msgstr "తిరస్కరించు (_R)"
 
-#: ../src/empathy-event-manager.c:583 ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
 msgid "_Answer"
 msgstr "సమాధానంయివ్వు (_A)"
 
-#: ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:570
 msgid "_Answer with video"
-msgstr ""
+msgstr "వీడియోతో జవాబువ్వండి (_A)"
 
-#: ../src/empathy-event-manager.c:751 ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
+#: ../src/empathy-call-window.c:1455
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s నుండి వీడియో కాల్ వస్తున్నది"
 
-#: ../src/empathy-event-manager.c:857
+#: ../src/empathy-event-manager.c:836
 msgid "Room invitation"
 msgstr "గది ఆహ్వానము"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:838
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s లో చేరుటకు ఆహ్వానం"
 
-#: ../src/empathy-event-manager.c:866
+#: ../src/empathy-event-manager.c:845
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s మిమ్మలను %sకు జేరుటకు ఆహ్వానిస్తున్నారు"
 
-#: ../src/empathy-event-manager.c:874
+#: ../src/empathy-event-manager.c:853
 msgid "_Decline"
 msgstr "తిరస్కరించు(_D)"
 
-#: ../src/empathy-event-manager.c:879
+#: ../src/empathy-event-manager.c:858
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "చేరు (_J)"
 
-#: ../src/empathy-event-manager.c:906
+#: ../src/empathy-event-manager.c:885
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s మిమ్ములను %sనందు జేరుటకు ఆహ్వానించారు"
 
-#: ../src/empathy-event-manager.c:912
+#: ../src/empathy-event-manager.c:891
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s లో చేరుటకు మీరు ఆహ్వానించబడ్డారు"
 
-#: ../src/empathy-event-manager.c:963
+#: ../src/empathy-event-manager.c:942
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s నుండి వచ్చుచున్న ఫైల్ బదిలీకరణ"
 
-#: ../src/empathy-event-manager.c:1155 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
 msgid "Password required"
 msgstr "సంకేతపదం అవసరం"
 
-#: ../src/empathy-event-manager.c:1211
+#: ../src/empathy-event-manager.c:1190
 #, c-format
 msgid "%s would like permission to see when you are online"
-msgstr ""
+msgstr "లో ఉన్నప్పుడు% s చూడండి అనుమతి కావాలనుకుంటున్నారని"
 
-#: ../src/empathy-event-manager.c:1215
+#: ../src/empathy-event-manager.c:1194
 #, c-format
 msgid ""
 "\n"
@@ -3848,6 +3930,10 @@ msgstr "\"%s\" యొక్క ఇంటిగ్రిటిని పరిశ
 msgid "Hashing \"%s\""
 msgstr "\"%s\" హాషింగ్"
 
+#: ../src/empathy-ft-manager.c:1026
+msgid "%"
+msgstr "%"
+
 #: ../src/empathy-ft-manager.c:1038
 msgid "File"
 msgstr "ఫైల్"
@@ -3869,8 +3955,7 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"దిగుమతి చేయుటకు ఏ ఖాతాలు కనుగొనలేకపోయింది. ఎంపతి ప్రస్తుతం ఖాతాలను పిడ్జిన్ "
-"నుండి దిగుమతి చేయుటకు "
+"దిగుమతి చేయుటకు ఏ ఖాతాలు కనుగొనలేకపోయింది. ఎంపతి ప్రస్తుతం ఖాతాలను పిడ్జిన్ నుండి దిగుమతి చేయుటకు "
 "మాత్రమే సహకరిస్తుంది."
 
 #: ../src/empathy-import-dialog.c:199
@@ -3926,111 +4011,104 @@ msgid "Top up account credit"
 msgstr "టాప్ అప్ ఖాతా క్రెడిట్"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-main-window.c:1046
 msgid "Top Up..."
 msgstr "టాప్ అప్..."
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-main-window.c:1789
 msgid "Contact"
 msgstr "చిరునామా"
 
-#: ../src/empathy-main-window.c:2169
+#: ../src/empathy-main-window.c:2121
 msgid "Contact List"
 msgstr "పరిచయముల జాబితా"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "ఖాతాలను చూపించు మరియు సవరించు"
-
-#: ../src/empathy-main-window.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "పటము పై పరిచయాలు (_M)"
 
-#: ../src/empathy-main-window.ui.h:2
+#: ../src/empathy-main-window-menubar.ui.h:2
 msgid "Credit Balance"
 msgstr "క్రెడిట్ బ్యాలెన్స్"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:3
 msgid "Find in Contact _List"
 msgstr "పరిచయముల జాబితాలో వెతుకు (_L)"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window-menubar.ui.h:4
 msgid "Join _Favorites"
 msgstr "ఇష్టాంశాలలో చేరు (_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window-menubar.ui.h:5
 msgid "Manage Favorites"
 msgstr "ఇష్టాంశాలను నిర్వహించు"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window-menubar.ui.h:6
 msgid "N_ormal Size"
 msgstr "సాధారణ పరిమాణము (_o)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
 msgstr "కొత్త కాల్...(_C)"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window-menubar.ui.h:8
 msgid "Normal Size With _Avatars"
 msgstr "అవతారములతో సాధారణ పరిమాణము (_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window-menubar.ui.h:9
 msgid "P_references"
 msgstr "ప్రాధాన్యతలు (_r)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window-menubar.ui.h:10
 msgid "Show P_rotocols"
 msgstr "ప్రోటోకాల్సును చూపించు (_r)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window-menubar.ui.h:11
 msgid "Sort by _Name"
 msgstr "పేరుని బట్టి క్రమబద్దీకరించు (_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window-menubar.ui.h:12
 msgid "Sort by _Status"
 msgstr "స్థితిని బట్టి క్రమబద్దీకరించు (_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ఖాతాలు (_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window-menubar.ui.h:15
 msgid "_Blocked Contacts"
 msgstr "నిరోధించబడిన పరిచయాలు (_O)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window-menubar.ui.h:17
 msgid "_Compact Size"
 msgstr "పరిమాణమును కుదించు (_C)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "డీబగ్ (_D)"
-
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window-menubar.ui.h:21
 msgid "_File Transfers"
 msgstr "ఫైల్ బదిలీలు (_F)"
 
-#: ../src/empathy-main-window.ui.h:23
+#: ../src/empathy-main-window-menubar.ui.h:23
 msgid "_Join…"
 msgstr "చేరు...(_J)"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window-menubar.ui.h:24
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
 msgstr "కొత్త సంభాషణ...(_N)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window-menubar.ui.h:25
 msgid "_Offline Contacts"
 msgstr "ఆఫ్‌లైన్ పరిచయాలు (_O)"
 
-#: ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-main-window-menubar.ui.h:26
 msgid "_Personal Information"
 msgstr "వ్యక్తిగత సమాచారము (_P)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-main-window-menubar.ui.h:28
 msgid "_Room"
 msgstr "గది (_R)"
 
-#: ../src/empathy-main-window.ui.h:29
+#: ../src/empathy-main-window-menubar.ui.h:29
 msgid "_Search for Contacts…"
 msgstr "పరిచయాల కోసం వెతుకు...(_S)"
 
@@ -4077,17 +4155,14 @@ msgstr "గది జాబితాను లోడు చేయలేకపో
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"ఇక్కడ చేరుటకు గది పేరును ప్రవేశపెట్టండి లేదా జాబితాలోని ఒకటి లేదా ఎక్కువ గదుల "
-"పై నొక్కండి."
+msgstr "ఇక్కడ చేరుటకు గది పేరును ప్రవేశపెట్టండి లేదా జాబితాలోని ఒకటి లేదా ఎక్కువ గదుల పై నొక్కండి."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr ""
-"గదికి ఆతిధ్యమిచ్చు సేవకమును ప్రవేశపెట్టండి, లేదా ఒకవేళ గది ప్రస్తుత ఖాతా "
-"సేవకములో ఉంటే ఖాళీగా వదిలివేయండి"
+"గదికి ఆతిధ్యమిచ్చు సేవకమును ప్రవేశపెట్టండి, లేదా ఒకవేళ గది ప్రస్తుత ఖాతా సేవకములో ఉంటే ఖాళీగా వదిలివేయండి"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid "Join Room"
@@ -4101,79 +4176,79 @@ msgstr "గది జాబితా"
 msgid "_Room:"
 msgstr "గది (_R):"
 
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:169
 msgid "Message received"
 msgstr "సందేశం స్వీకరించబడింది"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:170
 msgid "Message sent"
 msgstr "సందేశం పంపబడింది"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:171
 msgid "New conversation"
 msgstr "కొత్త సంభాషణ"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:172
 msgid "Contact goes online"
 msgstr "పరిచయం ఆన్‌లైన్‌కు వెళుతుంది"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:173
 msgid "Contact goes offline"
 msgstr "పరిచయం ఆఫ్‌లైనుకు వెళుతుంది"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:174
 msgid "Account connected"
 msgstr "ఖాతా అనుసంధానించబడింది"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:175
 msgid "Account disconnected"
 msgstr "ఖాతా అననుసంధానించబడింది"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:484
 msgid "Language"
 msgstr "భాష"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:734
 msgid "Juliet"
 msgstr "జూలియట్"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:741
 msgid "Romeo"
 msgstr "రోమియో"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:747
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ఓ రోమియో, రోమియో, ఎక్కడున్నావు రోమియో?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:750
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "నీ తండ్రి తిరస్కరించు మరియు నీ పేరు తిరస్కరించవచ్చు;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:753
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "లేదా నీవు విల్ట్ లేకపోతే, కానీ నా ప్రేమ ప్రమాణ స్వీకారం"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:756
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "నేను ఇకపై ఒక Capulet ఉంటాం."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:759
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "నేనింకా ఎక్కువ వినాలా, లేక నేను ఇక మాట్లాడవచ్చా?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:762
 msgid "Juliet has disconnected"
 msgstr "జూలియట్ అననుసంధానించింది"
 
-#: ../src/empathy-preferences.c:1131
+#: ../src/empathy-preferences.c:1166
 msgid "Preferences"
 msgstr "ప్రాధాన్యతలు"
 
@@ -4181,144 +4256,159 @@ msgstr "ప్రాధాన్యతలు"
 msgid "Appearance"
 msgstr "కనిపించువిధము"
 
-#: ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "ప్రవర్తన"
 
-#: ../src/empathy-preferences.ui.h:3
+#: ../src/empathy-preferences.ui.h:5
 msgid "Chat Th_eme:"
 msgstr "చాట్ థీము (_e):"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:6
 msgid "Disable notifications when _away or busy"
 msgstr "దూరంగా లేదాతీరికలేనప్పుడు ప్రకటనలను అచేతనపరుచు (_a)"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:7
 msgid "Disable sounds when _away or busy"
 msgstr "దూరంగా లేదా తీరికలేనప్పుడు శబ్దములను అచేతనపరుచు (_a)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "లోనికివచ్చు ఘటనలను ప్రకటిత ప్రాంతములో చూపించు"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:9
+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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"ప్రతిధ్వని రద్దు ఇతర వ్యక్తి మీ వాయిస్ ధ్వని స్వచ్చమైన చేయడానికి సహాయపడుతుంది, కానీ కొన్ని కంప్యూటర్లలో "
+"సమస్యలు కారణం కావచ్చు. మీరు లేదా ఇతర వ్యక్తి కాల్స్ సమయంలో వింత ధ్వనులను లేదా గ్లిట్చెస్ వినడానికి ఉంటే, "
+"ప్రతిధ్వని రద్దు ఆఫ్ చెయ్యడానికి మరియు కాల్ మళ్ళీ ప్రారంభించడానికి ప్రయత్నించండి."
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable notifications when a contact comes online"
 msgstr "పరిచయము ఆన్‌లైనుకు వచ్చినప్పుడు ప్రకటనలను చేతనపరుచు"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:11
 msgid "Enable notifications when a contact goes offline"
 msgstr "పరిచయం ఆఫ్‌లైన్‌కు వెళ్ళినప్పుడు ప్రకటనలను చేతనపరుచు"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr "చాట్ పై దృష్టిసారించనప్పుడు ప్రకటనలను చేతనపరుచు (_c)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:13
 msgid "Enable spell checking for languages:"
 msgstr "ఈ భాషలకు అక్షరక్రమ తనిఖీచేయుటని చేతనపరుచు:"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "సాధారణ"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:15
+msgid "Input level:"
+msgstr "ఇన్పుట్ స్థాయి:"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Input volume:"
+msgstr "ఇన్పుట్ పరిమాణం:"
+
+#: ../src/empathy-preferences.ui.h:18
 msgid "Location sources:"
 msgstr "స్థాన మూలాలు:"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:19
 msgid "Log conversations"
 msgstr "సంభాషణల చిట్టా"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:20
 msgid "Notifications"
 msgstr "ప్రకటనలు"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ఘటనల కొరకు శబ్దమును ప్లేచేయి"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Privacy"
 msgstr "గోప్యత"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"స్థానము ఖచ్చితత్వమును తగ్గించుట వలన మీ పట్టణము, రాష్ట్రము మరియు దేశము కంటే "
-"ఎక్కువ స్పష్టముగా "
+"స్థానము ఖచ్చితత్వమును తగ్గించుట వలన మీ పట్టణము, రాష్ట్రము మరియు దేశము కంటే ఎక్కువ స్పష్టముగా "
 "ప్రచురించబడవు.  GPS నిర్దేశకాలు ఖచ్చితముగా 1 డెసిమల్ స్థానమునకు ఉంటాయి."
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:24
 msgid "Show _smileys as images"
 msgstr "చిరునవ్వులను బొమ్మల వలె చూపించు (_s)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:25
 msgid "Show contact _list in rooms"
 msgstr "గదులలో పరిచయ జాబితాను చూపించు (_l)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:26
 msgid "Sounds"
 msgstr "శబ్దములు"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:27
 msgid "Spell Checking"
 msgstr "అక్షరక్రమ తనిఖీ"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:28
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr ""
-"మీరు ఏ భాషలకైతే ఒక నిఘంటువుని స్థాపించారో ఆ భాషల యొక్క జాబితా మాత్రమే "
-"ప్రతిబింబిస్తుంది."
+msgstr "మీరు ఏ భాషలకైతే ఒక నిఘంటువుని స్థాపించారో ఆ భాషల యొక్క జాబితా మాత్రమే ప్రతిబింబిస్తుంది."
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:29
 msgid "Themes"
 msgstr "థీములు"
 
-#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:30
 #| msgid "Theme Variant:"
 msgid "Variant:"
-msgstr "థీము రూపాంతరం:"
+msgstr "రూపాంతరం:"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "వ్యవస్థ ప్రారంభమయినపుడు స్వయంచాలకంగా అనుసంధానమవ్వు (_A)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "సెల్‌ఫోన్ (_C)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "బుడగ ప్రకటనలను చేతనపరుచు (_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "శబ్దపు ప్రకటనలను చేతనపరుచు (_E)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "నెట్‌వర్కు (IP, Wi-Fi) (_N)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Open new chats in separate windows"
 msgstr "వేరువేరు విండోలలో కొత్త చాట్‌లను తెరువు (_O)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:38
 msgid "_Publish location to my contacts"
 msgstr "స్థానమును నా పరిచయములకు ప్రచురించు (_P)"
 
 #. 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:35
+#: ../src/empathy-preferences.ui.h:40
 msgid "_Reduce location accuracy"
 msgstr "స్థానము ఖచ్చితత్వమును తగ్గించు (_R)"
 
@@ -4330,91 +4420,136 @@ msgstr "స్థితి"
 msgid "_Quit"
 msgstr "నిష్క్రమించు (_Q)"
 
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Call the contact again"
+msgstr "పరిచయానికి మళ్ళీ కాల్ చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Camera Off"
+msgstr "కెమెరా ఆపు"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "Camera On"
+msgstr "కెమెరా ఆన్ చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "కెమెరాను అచేతనపరుచు మరియు వీడియోని పంపుట ఆపివేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "కెమెరాను చేతనపరిచి, వీడియోను పంపు"
+
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "కెమెరాను చేతనపరుచు కాని వీడియో పంపవద్దు"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Preview"
+msgstr "మునుజూపు"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Redial"
+msgstr "తిరిగిడయిల్‌చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "V_ideo"
+msgstr "వీడియో (_i)"
+
+#: ../src/empathy-streamed-media-window.ui.h:21
+msgid "Video Off"
+msgstr "వీడియో ఆపు"
+
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Video On"
+msgstr "వీడియో ఆన్‌చేయి"
+
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Video Preview"
+msgstr "వీడియో మునుజూపు"
+
 #: ../src/empathy-map-view.c:448
 msgid "Contact Map View"
 msgstr "పరిచయ పటము వీక్షణ"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "భద్రపరచు"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "దోషశుద్ది విండో"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "నిలిపివేయి"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "స్థాయి "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "దోషశుద్ది"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "సమాచారము"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "సందేశము"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "హెచ్చరిక"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "క్లిష్టమైన"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "దోషము"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "సమయం"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "డొమైన్"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "వర్గము"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "స్థాయి"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
-"ఎంచుకున్న అనుసంధాన నిర్వాహకము దూరస్థ దోషశుద్ధిచేసే పొడిగింపుకు సహకరించుటలేదు."
+msgstr "ఎంచుకున్న అనుసంధాన నిర్వాహకము దూరస్థ దోషశుద్ధిచేసే పొడిగింపుకు సహకరించుటలేదు."
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:179
+#: ../src/empathy-invite-participant-dialog.c:205
 msgid "Invite Participant"
 msgstr "భాగస్వామిని ఆహ్వానించు"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:180
 msgid "Choose a contact to invite into the conversation:"
 msgstr "సంభాషణలోకి ఆహ్వానించుటకు ఒక పరిచయాన్ని ఎన్నుకోండి:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Invite"
 msgstr "ఆహ్వానించు"
 
 #: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"ఏ డైలాగులను ప్రదర్శించవద్దు; ఏదైనా పనిచేయి (ఉదా. దిగుమతిచేయుట) మరియు "
-"నిష్క్రమించు"
+msgstr "ఏ డైలాగులను ప్రదర్శించవద్దు; ఏదైనా పనిచేయి (ఉదా. దిగుమతిచేయుట) మరియు నిష్క్రమించు"
 
 #: ../src/empathy-accounts.c:187
 msgid ""
@@ -4423,8 +4558,7 @@ msgstr "కేవలం \"దగ్గరలోని వ్యక్తుల�
 
 #: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"ప్రాథమికంగా ఇచ్చిన ఖాతాను ఎంచుకొను (ఉదా, gabble/jabber/foo_40example_2eorg0)"
+msgstr "ప్రాథమికంగా ఇచ్చిన ఖాతాను ఎంచుకొను (ఉదా, gabble/jabber/foo_40example_2eorg0)"
 
 #: ../src/empathy-accounts.c:193
 msgid "<account-id>"
@@ -4438,7 +4572,16 @@ msgstr "- ఎంపతి ఖాతాలు"
 msgid "Empathy Accounts"
 msgstr "ఎంపతి ఖాతాలు"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:70
+msgid "Show a particular service"
+msgstr "ఒక నిర్దిష్ట సేవ చూపించు"
+
+#: ../src/empathy-debugger.c:75
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- తాదాత్మ్యం డీబగ్గర్"
+
+#: ../src/empathy-debugger.c:114
 msgid "Empathy Debugger"
 msgstr "ఎంపతి దోష శుద్దిచేసేది"
 
@@ -4451,17 +4594,19 @@ msgid "Respond"
 msgstr "స్పందించు"
 
 #: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-call-window.c:1459
 msgid "Reject"
 msgstr "తిరస్కరించు"
 
 #: ../src/empathy-notifications-approver.c:222
 #: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-call-window.c:1460
 msgid "Answer"
 msgstr "సమాధానమివ్వు"
 
 #: ../src/empathy-notifications-approver.c:227
 msgid "Answer with video"
-msgstr ""
+msgstr "వీడియో తో సమాధానం"
 
 #: ../src/empathy-notifications-approver.c:235
 #: ../src/empathy-notifications-approver.c:245
@@ -4473,37 +4618,76 @@ msgstr "నిరాకరించు"
 msgid "Accept"
 msgstr "అంగీకరించు"
 
+#. 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:260
 msgid "Provide"
 msgstr "సమకూర్చు"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:134
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
-msgstr ""
-"%s ఇప్పుడే కాల్ చేయడానికి ప్రయత్నించారు, కాని మీరు వేరే కాల్ నందు ఉన్నారు."
+msgstr "%s ఇప్పుడే కాల్ చేయడానికి ప్రయత్నించారు, కాని మీరు వేరే కాల్ నందు ఉన్నారు."
 
-#: ../src/empathy-call-window.c:1246
-#, fuzzy, c-format
-#| msgid "Call with %s"
-msgid "Call with %d participants"
-msgstr "%sతో కాల్ చేయి"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+msgid "i"
+msgstr " నెను"
+
+#: ../src/empathy-call-window.c:2775
+msgid "On hold"
+msgstr "లొ దచు"
+
+#: ../src/empathy-call-window.c:2778
+msgid "Mute"
+msgstr "నిశబ్దం"
+
+#: ../src/empathy-call-window.c:2780
+#| msgid "Location"
+msgid "Duration"
+msgstr "నిడివి"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
-#, fuzzy, c-format
+#: ../src/empathy-call-window.c:2783
+#, c-format
 #| msgid "Connected — %d:%02dm"
 msgid "%s — %d:%02dm"
-msgstr "అనుసంధానించబడింది — %d:%02dm"
-
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr ""
+msgstr "%s — %d:%02dm"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "సరిపోలు సందర్భం (_M)"
 
+#~ msgid "Find Next"
+#~ msgstr "తరువాతది కనుగొను"
+
+#~ msgid "Find Previous"
+#~ msgstr "మునుపటిది కనుగొను"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "అనురూపిత సందేశమును ప్రవేశపెట్టు"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "కొత్త స్థితి సందేశాన్ని భద్రపరుచు (_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "భద్రపరుచబడిన స్థితి సందేశాలు"
+
+#, fuzzy
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "డయల్‌ప్యాడ్"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "ఖాతాలను చూపించు మరియు సవరించు"
+
+#, fuzzy
+#~| msgid "Call with %s"
+#~ msgid "Call with %d participants"
+#~ msgstr "%sతో కాల్ చేయి"
+
 #~ msgid "All"
 #~ msgstr "అన్ని"
 
@@ -4693,9 +4877,6 @@ msgstr "సరిపోలు సందర్భం (_M)"
 #~ msgid "Allow _network usage"
 #~ msgstr "నెట్వర్కు వినియోగమును అనుమతించుము (_n)"
 
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue అమరికలు"
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "సేవ %s కొరకు అనువర్తనమును ప్రారంభించలేదు: %s"
 
diff --git a/po/ug.po b/po/ug.po
index 9ddc48eb0..1a7e9ba4d 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -8,10 +8,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-06-11 00:00+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-21 15:03+0000\n"
+"PO-Revision-Date: 2012-02-18 16:10+0900\n"
 "Last-Translator: Gheyret Kenji<gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,1234 +19,1252 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Google Talk، Facebook، MSN ۋە باشقا سۆھبەت مۇلازىمەتلىرىنى ئىشلىتىپ "
-"پاراڭلىشىش"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "ئالاقە كېلىشىمى"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy ئىنتېرنېت مۇڭداشقۇسى"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "ئالاقە كېلىشىمى"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Google Talk، Facebook، MSN ۋە باشقا سۆھبەت مۇلازىمەتلىرىنى ئىشلىتىپ پاراڭلىشىش"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "مۇڭداشقۇ ۋە VoIP ھېساباتلىرى"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "مۇڭداشقۇ ۋە VoIP ھېساباتلىرىنى باشقۇرۇش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "يېڭى سۆھبەت ئۈچۈن داۋاملىق يېڭى كۆزنەك ئىچىش"
+msgid "Connection managers should be used"
+msgstr "باغلىنىش باشقۇرغۇچىسى ئىشلىتىلىشى كېرەك"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"گۇرۇپپا سۆھبىتىدە لەقىمىنى تاماملاش(tab) تا ئىشلىتىدىغان، لەقەمنىڭ ئاخىرىغا "
-"قوشۇلىدىغان ھەرپ."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "باغلىنىش باشقۇرغۇچىسى ئاپتوماتىك ئۈزۈلۈش/قايتا باغلىنىشنى باشقۇرامدۇ يوق"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "سۆھبەت كۆزنەك ئۆرنىكى"
+msgid "Empathy should auto-connect on startup"
+msgstr "قوزغالغان ھامان Empathy ئاپتوماتىك باغلانسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Chat window theme variant"
-msgstr "سۆھبەت كۆزنەك ئۆرنىكىنىڭ شالغۇت"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "قوزغالغاندا ھېساباتقا ئاپتوماتىك كىرەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"ئىملا تەكشۈرۈشتە ئىشلىتىدىغان تىللارنىڭ تىزىمى(پەس بىلەن ئايرىلغان، \"en, "
-"fr, nl\" دېگەندەك)"
+msgid "Empathy should auto-away when idle"
+msgstr "بىكار ۋاقتىدا Empathy نىڭ ھالىتى ئاپتوماتىك ھالدا يوققا ئۆزگەرسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Compact contact list"
-msgstr "دوستلار تىزىمى(ئىخچام)"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "ئىشلەتكۈچى جىم تۇرسا، ئاپتوماتىك ھالدا ئورنىدا يوق ھالىتىگە كىرەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Connection managers should be used"
-msgstr "باغلىنىش باشقۇرغۇچىسى ئىشلىتىلىشى كېرەك"
+msgid "Empathy default download folder"
+msgstr "تۇتاش كۆڭۈللەرنىڭ ئەسلىدىكى چۈشۈرۈش مۇندەرىجىسى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Contact list sort criterion"
-msgstr "تونۇشلار تىزىمنى تەرتىپلەش ئۆلچىمى"
+msgid "The default folder to save file transfers in."
+msgstr "قوبۇل قىلغان ھۆججەتلەرنى ساقلايدىغان كۆڭۈلدىكى قىسقۇچ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Default directory to select an avatar image from"
-msgstr "باش سۈرەتنى تاللايدىغان كۆڭۈلدىكى مۇندەرىجە"
+msgid "Show offline contacts"
+msgstr "توردا يوق ئالاقەداشلارنىمۇ كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable popup notifications when away"
-msgstr "يوق چاغدا سەكرىمە ئۇقتۇرۇشىنى چىقارمىسۇن"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "ئالاقەداشلار تىزىمىدا  توردا يوق ئالاقەداشلارنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Disable sounds when away"
-msgstr "ئايرىلغاندا ئاۋازنى ئېتىش"
+msgid "Show avatars"
+msgstr "باش سۈرەتلەرنى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Display incoming events in the status area"
-msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "ئالاقەداشلار تىزىمى ۋە سۆھبەت كۆزنىكىدە ئالاقەداشلارنىڭ باش سۈرىتىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت. ئەگەر تاللانمىسا(false بولسا)، "
-"ئىشلەتكۈچىگە شۇ ھامان كۆرسىتىدۇ."
+msgid "Show protocols"
+msgstr "كېلىشىمنامىلەرنى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Empathy can publish the user's location"
-msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئېلان قىلالايدۇ"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "ئالاقەداشلار تىزىمىدا ئالاقەداشلارنىڭ كېلىشىمىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Empathy can use the GPS to guess the location"
-msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە GPS نى ئىشلەتكىلى بولىدۇ"
+msgid "Show Balance in contact list"
+msgstr "ئالاقەداش تىزىمىدا Balance نى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە يانفون تورىنى ئىشلەتكىلى بولىدۇ"
+msgid "Whether to show account balances in the contact list."
+msgstr "ئالاقەداشلار تىزىمىدا ھېسابات  balance لىرىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy can use the network to guess the location"
-msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە تورنى ئىشلەتكىلى بولىدۇ"
+msgid "Compact contact list"
+msgstr "دوستلار تىزىمى(ئىخچام)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy default download folder"
-msgstr "تۇتاش كۆڭۈللەرنىڭ ئەسلىدىكى چۈشۈرۈش مۇندەرىجىسى"
+msgid "Whether to show the contact list in compact mode."
+msgstr "ئالاقەداش تىزىمىنى ئىخچام كۆرۈنۈشتە كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy has migrated butterfly logs"
-msgstr "butterfly خاتىرىلىرىنى يۆتكىدى."
+msgid "Hide main window"
+msgstr "ئاساسى كۆزنەكنى يوشۇر"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-away when idle"
-msgstr "بىكار ۋاقتىدا Empathy نىڭ ھالىتى ئاپتوماتىك ھالدا يوققا ئۆزگەرسۇن"
+msgid "Hide the main window."
+msgstr "بۇ ئاساسى كۆزنەكنى يوشۇر"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should auto-connect on startup"
-msgstr "قوزغالغان ھامان Empathy ئاپتوماتىك باغلانسۇن"
+msgid "Default directory to select an avatar image from"
+msgstr "باش سۈرەتنى تاللايدىغان كۆڭۈلدىكى مۇندەرىجە"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy ئورۇننىڭ ئېنىقلىقىغا بەك ئېتىبار بەرمىسىمۇ بولىدۇ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "باش سۈرەت تاللانغان ئەڭ ئاخىرقى قىسقۇچ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"سۆھبەت كۆزنىكىنىڭ سىنبەلگىسىنىڭ ئورنىغا ئالاقەداشنىڭ باش سۈرىتىنى كۆرسەتسۇن"
+msgid "Open new chats in separate windows"
+msgstr "ئايرىم كۆزنەكتە يېڭى سۆھبەت باشلايدۇ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable WebKit Developer Tools"
-msgstr "WebKit ئىجادىيەت قورالىنى قوزغات"
+msgid "Always open a separate chat window for new chats."
+msgstr "يېڭى سۆھبەت ئۈچۈن داۋاملىق يېڭى كۆزنەك ئىچىش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable popup notifications for new messages"
-msgstr "يېڭى خەت كەلگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Display incoming events in the status area"
+msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Enable spell checker"
-msgstr "ئىملا تەكشۈرگۈچنى قوزغات"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "كەلگەن ھادىسىلەرنى ھالەت رايونىدا كۆرسەت. ئەگەر تاللانمىسا(false بولسا)، ئىشلەتكۈچىگە شۇ ھامان كۆرسىتىدۇ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Hide main window"
-msgstr "ئاساسى كۆزنەكنى يوشۇر"
+msgid "The position for the chat window side pane"
+msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنەكچىسىنىڭ ئورنى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Hide the main window."
-msgstr "بۇ ئاساسى كۆزنەكنى يوشۇر"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنىكىنىڭ ساقلاپ قويۇلغان ئورنى(پىكسېل)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Nick completed character"
-msgstr "لەقەمنى تاماملاش ھەرپى"
+#| msgid "Show contact list in rooms"
+msgid "Show contact groups"
+msgstr "ئالاقەداش گۇرۇپپىسى كۆرسەتسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Open new chats in separate windows"
-msgstr "ئايرىم كۆزنەكتە يېڭى سۆھبەت باشلايدۇ"
+#| msgid "Whether to show account balances in the contact list."
+msgid "Whether to show groups in the contact list."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use"
-msgstr "ئىشلىتىدىغان Adium ئۇسلۇبى(theme)نىڭ يولى"
+msgid "Contact list sort criterion"
+msgstr "تونۇشلار تىزىمنى تەرتىپلەش ئۆلچىمى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "سۆھبەتتە Adium ئۇسلۇبى ئىشلىتىلگەن بولسا ئۇنىڭ يولى."
+#| 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 ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Play a sound for incoming messages"
-msgstr "ئۇچۇر كەلگەندە ئاۋاز چىقارسۇن"
+msgid "Use notification sounds"
+msgstr "ئۇقتۇرۇش ئاۋازلىرىنى ئىشلەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for new conversations"
-msgstr "يېڭى سۆھبەت ئۈچۈن ئاۋاز قوي"
+msgid "Whether to play a sound to notify of events."
+msgstr "ھادىسىلەرنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Play a sound for outgoing messages"
-msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋاز چىقارسۇن"
+msgid "Disable sounds when away"
+msgstr "ئايرىلغاندا ئاۋازنى ئېتىش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Play a sound when a contact logs in"
-msgstr "ئالاقەداش كىرگەندە ئاۋاز چىقارسۇن"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when a contact logs out"
-msgstr "ئالاقەداش چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
+msgid "Play a sound for incoming messages"
+msgstr "ئۇچۇر كەلگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log in"
-msgstr "كىرگەندە ئاۋاز چىقارسۇن"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ئۇچۇر كەلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound when we log out"
-msgstr "چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
+msgid "Play a sound for outgoing messages"
+msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "سۆھبەت فوكۇسلانمىغاندا سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs in"
-msgstr "ئالاقەداش كىرگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Play a sound for new conversations"
+msgstr "يېڭى سۆھبەت ئۈچۈن ئاۋاز قوي"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Pop up notifications when a contact logs out"
-msgstr "ئالاقەداش چىقىپ كەتكەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "يېڭى سۆھبەتنىڭ باشلانغانلىقىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show Balance in contact list"
-msgstr "ئالاقەداش تىزىمىدا Balance نى كۆرسەت"
+msgid "Play a sound when a contact logs in"
+msgstr "ئالاقەداش كىرگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show avatars"
-msgstr "باش سۈرەتلەرنى كۆرسەت"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ئالاقەداشنىڭ تورغا كىرگىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Show contact list in rooms"
-msgstr "ئۆيلەردىكى ئالاقەداشلار تىزىمىنى كۆرسەت"
+msgid "Play a sound when a contact logs out"
+msgstr "ئالاقەداش چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show hint about closing the main window"
-msgstr "ئاساسىي كۆزنەكنى ياپىدىغان چاغدا كۆرسەتمە كۆرسىتەمدۇ يوق"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ئالاقەداشنىڭ توردىن چىقىپ كەتكىنىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Show offline contacts"
-msgstr "توردا يوق ئالاقەداشلارنىمۇ كۆرسەت"
+msgid "Play a sound when we log in"
+msgstr "كىرگەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Show protocols"
-msgstr "كېلىشىمنامىلەرنى كۆرسەت"
+msgid "Whether to play a sound when logging into a network."
+msgstr "تورغا كىرگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Spell checking languages"
-msgstr "ئىملا تەكشۈرۈش تىلى"
+msgid "Play a sound when we log out"
+msgstr "چىقىپ كەتكەندە ئاۋاز چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The default folder to save file transfers in."
-msgstr "قوبۇل قىلغان ھۆججەتلەرنى ساقلايدىغان كۆڭۈلدىكى قىسقۇچ."
+msgid "Whether to play a sound when logging out of a network."
+msgstr "تور چىققاندا ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The last directory that an avatar image was chosen from."
-msgstr "باش سۈرەت تاللانغان ئەڭ ئاخىرقى قىسقۇچ."
+msgid "Enable popup notifications for new messages"
+msgstr "يېڭى خەت كەلگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The position for the chat window side pane"
-msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنەكچىسىنىڭ ئورنى"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "يېڭى ئۇچۇر تاپشۇرۇۋالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "سۆھبەت كۆزنىكىنىڭ يان كۆزنىكىنىڭ ساقلاپ قويۇلغان ئورنى(پىكسېل)"
+msgid "Disable popup notifications when away"
+msgstr "يوق چاغدا سەكرىمە ئۇقتۇرۇشىنى چىقارمىسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr ""
-"سۆھبەت كۆزنىكىدە ئىشلىتىلىدىغان پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۇسلۇب."
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr ""
-"سۆھبەت كۆزنىكىدىكى پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۆرنەك شالغۇتى."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "سۆھبەت فوكۇسلانمىغاندا سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Use graphical smileys"
-msgstr "رەسىملىك چىراي ئىپادىلىرىنى ئىشلەت"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "سۆھبەت باشلانغان بىراق فوكۇسلانمىغاندا، ئۇچۇر كەلسە سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "Use notification sounds"
-msgstr "ئۇقتۇرۇش ئاۋازلىرىنى ئىشلەت"
+msgid "Pop up notifications when a contact logs in"
+msgstr "ئالاقەداش كىرگەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Use theme for chat rooms"
-msgstr "سۆھبەتخانىلارغا تېما(ئۇسلۇب) ئىشلەت"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "ئالاقەداش تورغا چىققاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئالاقەداشلارغا ئاشكارىلامدۇ يوق."
+msgid "Pop up notifications when a contact logs out"
+msgstr "ئالاقەداش چىقىپ كەتكەندە سەكرىمە ئۇقتۇرۇش چىقارسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن GPS ئىشلىتەمدۇ يوق."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "ئالاقەداش توردىن يوقالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن يانفون تورى ئىشلىتەمدۇ يوق."
+msgid "Use graphical smileys"
+msgstr "رەسىملىك چىراي ئىپادىلىرىنى ئىشلەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن تور ئىشلىتەمدۇ يوق."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "سۆھبەتتە چىراي ئىپادىلىرىنى گرافىكقا ئايلاندۇرامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "butterfly خاتىرىسىنى يۆتكىدىمۇ يوق."
+msgid "Show contact list in rooms"
+msgstr "ئۆيلەردىكى ئالاقەداشلار تىزىمىنى كۆرسەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "قوزغالغاندا ھېساباتقا ئاپتوماتىك كىرەمدۇ يوق."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "سۆھبەتخانىدا ئالاقەداش تىزىمىنى كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ئىشلەتكۈچى جىم تۇرسا، ئاپتوماتىك ھالدا ئورنىدا يوق ھالىتىگە كىرەمدۇ يوق."
+msgid "Chat window theme"
+msgstr "سۆھبەت كۆزنەك ئۆرنىكى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"شەخسىي سىرنى ئويلىشىپ Empathy ئورۇننىڭ توغرىلىق دەرىجىسىنى تۆۋەنلىتەمدۇ يوق."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "سۆھبەت كۆزنىكىدە ئىشلىتىلىدىغان پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۇسلۇب."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr ""
-"Empathy ئالاقەداشنىڭ باش سۈرىتىنى سۆھبەت كۆزنىكىنىڭ سىنبەلگىسى قىلىپ "
-"ئىشلىتەمدۇ يوق."
+msgid "Chat window theme variant"
+msgstr "سۆھبەت كۆزنەك ئۆرنىكىنىڭ شالغۇت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Web Inspector غا ئوخشاش WebKit ئىجادىيەت قوراللىرىنى ئىناۋەتلىك قىلامدۇ يوق."
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "سۆھبەت كۆزنىكىدىكى پاراڭلارنى كۆرسىتىشتە ئىشلىتىلىدىغان ئۆرنەك شالغۇتى."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"باغلىنىش باشقۇرغۇچىسى ئاپتوماتىك ئۈزۈلۈش/قايتا باغلىنىشنى باشقۇرامدۇ يوق"
+msgid "Path of the Adium theme to use"
+msgstr "ئىشلىتىدىغان Adium ئۇسلۇبى(theme)نىڭ يولى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "كۆرسىتىلگەن تىلدا كىرگۈزۈلگەن سۆزنى تەكشۈرەمدۇ يوق."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "سۆھبەتتە Adium ئۇسلۇبى ئىشلىتىلگەن بولسا ئۇنىڭ يولى."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "سۆھبەتتە چىراي ئىپادىلىرىنى گرافىكقا ئايلاندۇرامدۇ يوق."
+msgid "Enable WebKit Developer Tools"
+msgstr "WebKit ئىجادىيەت قورالىنى قوزغات"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ئالاقەداشنىڭ تورغا كىرگىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Web Inspector غا ئوخشاش WebKit ئىجادىيەت قوراللىرىنى ئىناۋەتلىك قىلامدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ئالاقەداشنىڭ توردىن چىقىپ كەتكىنىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Inform other users when you are typing to them"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of events."
-msgstr "ھادىسىلەرنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ئۇچۇر كەلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Use theme for chat rooms"
+msgstr "سۆھبەتخانىلارغا تېما(ئۇسلۇب) ئىشلەت"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "يېڭى سۆھبەتنىڭ باشلانغانلىقىنى ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Whether to use the theme for chat rooms."
+msgstr "بۇ ئۇسلۇب(theme)نى سۆھبەتخانا كۆزنىكىگە ئىشلىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ئۇچۇر ئەۋەتىلگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Spell checking languages"
+msgstr "ئىملا تەكشۈرۈش تىلى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound when logging into a network."
-msgstr "تورغا كىرگەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "ئىملا تەكشۈرۈشتە ئىشلىتىدىغان تىللارنىڭ تىزىمى(پەس بىلەن ئايرىلغان، \"en, fr, nl\" دېگەندەك)"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to play a sound when logging out of a network."
-msgstr "تور چىققاندا ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid "Enable spell checker"
+msgstr "ئىملا تەكشۈرگۈچنى قوزغات"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play sound notifications when away or busy."
-msgstr ""
-"ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە ئاۋازلىق ئۇقتۇرۇش قىلامدۇ يوق."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "كۆرسىتىلگەن تىلدا كىرگۈزۈلگەن سۆزنى تەكشۈرەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "ئالاقەداش توردىن يوقالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid "Nick completed character"
+msgstr "لەقەمنى تاماملاش ھەرپى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "ئالاقەداش تورغا چىققاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "گۇرۇپپا سۆھبىتىدە لەقىمىنى تاماملاش(tab) تا ئىشلىتىدىغان، لەقەمنىڭ ئاخىرىغا قوشۇلىدىغان ھەرپ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"سۆھبەت باشلانغان بىراق فوكۇسلانمىغاندا، ئۇچۇر كەلسە سەكرىمە ئۇقتۇرۇش "
-"چىقىرامدۇ يوق."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "سۆھبەت كۆزنىكىنىڭ سىنبەلگىسىنىڭ ئورنىغا ئالاقەداشنىڭ باش سۈرىتىنى كۆرسەتسۇن"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "يېڭى ئۇچۇر تاپشۇرۇۋالغاندا سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy ئالاقەداشنىڭ باش سۈرىتىنى سۆھبەت كۆزنىكىنىڭ سىنبەلگىسى قىلىپ ئىشلىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show account balances in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا ھېسابات  balance لىرىنى كۆرسىتەمدۇ يوق."
+msgid "Last account selected in Join Room dialog"
+msgstr ""
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
+msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
-"ئالاقەداشلار تىزىمى ۋە سۆھبەت كۆزنىكىدە ئالاقەداشلارنىڭ باش سۈرىتىنى "
-"كۆرسىتەمدۇ يوق."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا  توردا يوق ئالاقەداشلارنى كۆرسىتەمدۇ يوق."
+#| msgid "Camera On"
+msgid "Camera device"
+msgstr "كامېرا ئۈسكۈنىسى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"ئالدىراش ياكى ئايرىلغان ھالەتكە ئۆتكەندە سەكرىمە ئۇقتۇرۇش چىقىرامدۇ يوق."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "سىنلىق سۆزلىشىشتە ئىشلىتىدىغان كامېرا ئۈسكۈنىسى، مەسىلەن /dev/video0. دېگەندەك"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ئالاقەداشلار تىزىمىدا ئالاقەداشلارنىڭ كېلىشىمىنى كۆرسىتەمدۇ يوق."
+#| msgid "Camera On"
+msgid "Camera position"
+msgstr "كامېرا ئورنى"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show the contact list in chat rooms."
-msgstr "سۆھبەتخانىدا ئالاقەداش تىزىمىنى كۆرسىتەمدۇ يوق."
+msgid "Position the camera preview should be during a call."
+msgstr "سۆزلىشىۋاتقان چاغدىكى كامېرا ئالدىن كۆزىتىش كۆزنىكىنىڭ ئورنى."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show the contact list in compact mode."
-msgstr "ئالاقەداش تىزىمىنى ئىخچام كۆرۈنۈشتە كۆرسىتەمدۇ يوق."
+msgid "Echo cancellation support"
+msgstr "ئەكس سادانى ئاجىزلىتىش"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"ماۋزۇ بالدىقىدىكى «x» توپچىسىنى چېكىپ ئاساسىي كۆزنەكنى ياپقاندا ئۇچۇر "
-"سۆزلەشكۈسى چىقىرامدۇ يوق."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Pulseaudio نىڭ ئەكس سادانى ئاجىزلىتىش سۈزگۈچىنى ئىناۋەتلىك قىلامدۇ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to use the theme for chat rooms."
-msgstr "بۇ ئۇسلۇب(theme)نى سۆھبەتخانا كۆزنىكىگە ئىشلىتەمدۇ يوق."
+msgid "Show hint about closing the main window"
+msgstr "ئاساسىي كۆزنەكنى ياپىدىغان چاغدا كۆرسەتمە كۆرسىتەمدۇ يوق"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 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."
-msgstr ""
-"ئالاقەداشلار تىزىمىدىكى ئالاقەداشلارنى تەرتىپلىگەندە قانداق شەرت ئىشلىتىدۇ. "
-"كۆڭۈلدە «ئاتى» بويىچە تەرتىپلەيدۇ. «ھالىتى» بويىچە تەرتىپلەشكىمۇ بولىدۇ."
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "ماۋزۇ بالدىقىدىكى «x» توپچىسىنى چېكىپ ئاساسىي كۆزنەكنى ياپقاندا ئۇچۇر سۆزلەشكۈسى چىقىرامدۇ يوق."
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "مۇڭداشقۇ ۋە VoIP ھېساباتلىرىنى باشقۇرۇش"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can publish the user's location"
+msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئېلان قىلالايدۇ"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2320
-msgid "Messaging and VoIP Accounts"
-msgstr "مۇڭداشقۇ ۋە VoIP ھېساباتلىرى"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy ئىشلەتكۈچىنىڭ ئورنىنى ئالاقەداشلارغا ئاشكارىلامدۇ يوق."
 
-#: ../libempathy/empathy-ft-handler.c:825
-msgid "File transfer completed, but the file was corrupted"
-msgstr "ھۆججەت يوللاش تاماملاندى"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the network to guess the location"
+msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە تورنى ئىشلەتكىلى بولىدۇ"
 
-#: ../libempathy/empathy-ft-handler.c:1113
-msgid "File transfer not supported by remote contact"
-msgstr "يىراقتىكى ئىشلەتكۈچى ھۆججەت ئەۋەتىشنى ئىشلىتەلمەيدۇ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن تور ئىشلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-ft-handler.c:1169
-msgid "The selected file is not a regular file"
-msgstr "تاللانغان ھۆججەت مۇنتىزىم ھۆججەت ئەمەس"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە يانفون تورىنى ئىشلەتكىلى بولىدۇ"
 
-#: ../libempathy/empathy-ft-handler.c:1178
-msgid "The selected file is empty"
-msgstr "تاللانغان ھۆججەت قۇرۇق"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن يانفون تورى ئىشلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-message.c:342 ../src/empathy-call-observer.c:130
-#, c-format
-msgid "Missed call from %s"
-msgstr "%s دىن كەلگەن جاۋابسىز چاقىرىش"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "ئورۇننى ئېنىقلاش ئۈچۈن Empathy دە GPS نى ئىشلەتكىلى بولىدۇ"
 
-#: ../libempathy/empathy-message.c:345
-#, c-format
-msgid "Called %s"
-msgstr "چاقىردى %s"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy ئورۇننى بەلگىلەش ئۈچۈن GPS ئىشلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-message.c:348
-#, c-format
-msgid "Call from %s"
-msgstr "چاقىرىلدى %s"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy ئورۇننىڭ ئېنىقلىقىغا بەك ئېتىبار بەرمىسىمۇ بولىدۇ"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "سوكېت تىپىنى ئىشلەتكىلى بولمايدۇ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "شەخسىي سىرنى ئويلىشىپ Empathy ئورۇننىڭ توغرىلىق دەرىجىسىنى تۆۋەنلىتەمدۇ يوق."
 
-#: ../libempathy/empathy-tp-file.c:387
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "سەۋەب كۆرسىتىلمىگەن"
 
-#: ../libempathy/empathy-tp-file.c:390
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "ھالەتنى ئۆزگەرتىش تەلەپ قىلىندى"
 
-#: ../libempathy/empathy-tp-file.c:393
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "ھۆججەت ئەۋەتىشنى ئەمەلدىن قالدۇرۇۋەتتىڭىز"
 
-#: ../libempathy/empathy-tp-file.c:396
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "قارشى تەرەپ ھۆججەت ئەۋەتىشنى ئەمەلدىن قالدۇرۇۋەتتى"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "ھۆججەت ئەۋەتمەكچى بولغاندا خاتالىق كۆرۈلدى"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "قارشى تەرەپ ھۆججەتنى ئەۋەتەلمىدى"
 
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "نامەلۇم سەۋەب"
 
-#: ../libempathy/empathy-utils.c:246
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "ھۆججەت يوللاش تاماملاندى"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "يىراقتىكى ئىشلەتكۈچى ھۆججەت ئەۋەتىشنى ئىشلىتەلمەيدۇ"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "تاللانغان ھۆججەت مۇنتىزىم ھۆججەت ئەمەس"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "تاللانغان ھۆججەت قۇرۇق"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#, c-format
+msgid "Missed call from %s"
+msgstr "%s دىن كەلگەن جاۋابسىز چاقىرىش"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "چاقىردى %s"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "چاقىرىلدى %s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "ئىشلىتىلىشچان"
 
-#: ../libempathy/empathy-utils.c:248
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ئالدىراش"
 
-#: ../libempathy/empathy-utils.c:251
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "يوق"
 
-#: ../libempathy/empathy-utils.c:253
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "يوشۇرۇن"
 
-#: ../libempathy/empathy-utils.c:255
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "توردا يوق"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:258
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "سەۋەبى كۆرسىتىلمىدى"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "ھالەت توردا يوق قىلىپ بەلگىلەندى"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "تور خاتالىقى"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "دەلىللەش مەغلۇپ بولدى"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "شىفىرلاش خاتالىقى"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "ئات ئىشلىتىلىۋاتىدۇ"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ئىسپاتنامە تەمىنلەنمىگەن"
 
-#: ../libempathy/empathy-utils.c:311 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "ئىسپاتنامە ئىشەنچسىز"
 
-#: ../libempathy/empathy-utils.c:313 ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "ئىسپاتنامىنىڭ ۋاقتى ئوتكەن"
 
-#: ../libempathy/empathy-utils.c:315 ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "ئىسپاتنامە ئاكتىپ ئەمەس"
 
-#: ../libempathy/empathy-utils.c:317 ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ئىسپاتنامە كومپيۇتېرىنىڭ ئاتى ماسلاشمىدى"
 
-#: ../libempathy/empathy-utils.c:319 ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "ئىسپاتنامىنىڭ بارماق ئىزى ماسلاشمىدى"
 
-#: ../libempathy/empathy-utils.c:321 ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "ئىسپاتنامىنىڭ ئۆزىنىڭ ئىمزاسى"
 
-#: ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "ئىسپاتنامە خاتا"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "شىفىرلاشنى ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "ئىسپاتنامە ئىناۋەتسىز"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "باغلىنىش رەت قىلىندى"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "باغلانغىلى بولمىدى"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "باغلىنىش ئۈزۈلدى"
 
-#: ../libempathy/empathy-utils.c:367
-msgid "This resource is already connected to the server"
-msgstr "بۇ مەنبە ئاللىقاچان مۇلازىمېتىرغا باغلانغان"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "بۇ ھېسابات ئاللىقاچان مۇلازىمېتىرغا باغلانغان"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ئوخشاش مەنبە ئىشلەتكەن باغلىنىش ئەسلىدىكىنىڭ ئورنىنى ئىگىلىدى"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "مۇلازىمېتىردا بۇ ھېسابات ئاللىقاچان بار"
 
-#: ../libempathy/empathy-utils.c:374
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "مۇلازىمېتىر بەكلا ئالدىراش بولغاچقا بۇ باغلىنىشنى بىر تەرەپ قىلالمايدۇ"
 
-#: ../libempathy/empathy-utils.c:376
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ئىسپاتنامە ئىناۋەتسىز قىلىنغان"
 
-#: ../libempathy/empathy-utils.c:378
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr ""
-"ئىسپاتنامە خەتەرلىك شىفىرلاش ئالگورىزىم ئىشلەتكەن ياكى شىفىرلىنىشى ئاجىز"
+msgstr "ئىسپاتنامە خەتەرلىك شىفىرلاش ئالگورىزىم ئىشلەتكەن ياكى شىفىرلىنىشى ئاجىز"
 
-#: ../libempathy/empathy-utils.c:381
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
-msgstr ""
-"مۇلازىمېتىر ئىسپاتنامىسىنىڭ ئۇزۇنلۇقى ياكى مۇلازىمېتىر ئىسپاتنامىسىنىڭ "
-"زەنجىرىنىڭ چوڭقۇرلۇقى شىفىرلاش فۇنكسىيە ئامبىرىدا بەلگىلەنگەن ئۇزۇنلۇقتىن "
-"ئېشىپ كەتتى"
+msgstr "مۇلازىمېتىر ئىسپاتنامىسىنىڭ ئۇزۇنلۇقى ياكى مۇلازىمېتىر ئىسپاتنامىسىنىڭ زەنجىرىنىڭ چوڭقۇرلۇقى شىفىرلاش فۇنكسىيە ئامبىرىدا بەلگىلەنگەن ئۇزۇنلۇقتىن ئېشىپ كەتتى"
 
-#: ../libempathy/empathy-utils.c:544
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "يۇمشاق دېتالىڭىز بەك كونا ئىكەن"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "ئىچكى خاتالىق"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "قوشنىلار"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Japan"
 
-#: ../libempathy/empathy-utils.c:578
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google سۆھبەت"
 
-#: ../libempathy/empathy-utils.c:579
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook سۆھبەت"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
-msgstr[0] "%d سېكۇنت بۇرۇن"
+msgstr[0] "%d سېكۇنت ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d مىنۇت ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d سائەت ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d كۈن ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d ھەپتە ئىلگىرى"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d ئاي بۇرۇن"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "كەلگۈسىدە"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:539
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "بارلىق ھېساباتلار"
 
-#: ../libempathy-gtk/empathy-account-widget.c:681
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "ھېسابات"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "ئىم"
 
-#: ../libempathy-gtk/empathy-account-widget.c:683
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "مۇلازىمېتىر"
 
-#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ئېغىز"
 
-#: ../libempathy-gtk/empathy-account-widget.c:756
-#: ../libempathy-gtk/empathy-account-widget.c:813
+#: ../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:1154
-#, c-format
-msgid "The account %s is edited via My Web Accounts."
-msgstr "ھېسابات %s نى تور ھېساباتىم ئارقىلىق تەھرىرلىگىلى بولمىدى."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1160
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "ھېسابات %s نى Empathy دە تەھرىرلىگىلى بولمىدى."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1180
-msgid "Launch My Web Accounts"
-msgstr "تور ھېساباتىمنى ئاچ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1518
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ئىشلەتكۈچى ئاتى:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1836
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "قوللان(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1866
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "تىزىمغا كىر(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1940
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "بۇ ھېسابات مۇلازىمېتىردا ئاللىقاچان بار"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1943
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "مۇلازىمېتىردا يېڭى ھېسابات قۇرىدۇ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2135
-msgid "Ca_ncel"
-msgstr "ۋاز كەچ(_N)"
-
 #. 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:2413
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ئۈستىدىكى %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2439
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ھېسابات"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2443
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "يېڭى ھېسابات"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>مەسىلەن:</b> مېنىڭ ئاتىم"
+#: ../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:"
+msgstr "ئىم(_W):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "ئالىي"
+msgid "Screen _Name:"
+msgstr "ئاتى"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>مەسىلەن:</b> مېنىڭ ئاتىم"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "ئىم(_W):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "ئىم ئەستە تۇت"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "ئىمنى ئەستە تۇتۇش"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "ئېغىز(_P):"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "ئىم ئەستە تۇت"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "ئاتى"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "مۇلازىمېتىر(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "AIM دىكى ئىمىڭىز؟"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "ئالىي"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "AIM دىكى ئاتىڭىز؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "ئېغىز(_P):"
+msgid "What is your AIM password?"
+msgstr "AIM دىكى ئىمىڭىز؟"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "مۇلازىمېتىر(_S):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>مىسال:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "ئىمنى ئەستە تۇتۇش"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "تىزىمغا كىرىش ID: (_D)"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>مىسال:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "GroupWise ئىشلەتكۈچى كىملىكىڭىز نېمە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "GroupWise دىكى ئىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>مىسال:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ھەرپ توپلىمى(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ICQ دىكى ئاتىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ICQ دىكى ئىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
 msgid "Auto"
 msgstr "ئاپتوماتىك"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../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:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
 msgid "Register"
 msgstr "خەتلەت"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "تاللانما"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "يوق"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "ھەرپ توپلىمى:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "تور"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "تور:"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "ھەرپ توپلىمى:"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "مۇلازىمېتىر"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "نۇرغۇن IRC مۇلازىمەتلىرى ئىم تەلەپ قىلمايدۇ، بىلمىسىڭىز ئىمنى كىرگۈزمەڭ."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "تەخەللۇس:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "ئىم:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "ئاخىرلاشتۇرۇش ئۇچۇرى:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "تولۇق ئىسىم:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "مۇلازىمېتىر"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "قايسى IRC تورى؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "What is your IRC nickname?"
 msgstr "IRC دىكى لەقىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Which IRC network?"
-msgstr "قايسى IRC تورى؟"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Facebook دىكى ئاتىڭىز؟"
+
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr "بۇ سىزنىڭ ئىشلەتكۈچى ئاتىڭىزدۇر. Facebook قا كىرىشتە ئىشلىتىدىغىنى ئەمەس.\n"
+" ئەگەر سىز Facebook دا facebook.com/<b>badger</b> بولسىڭىز، <b>badger</b> دەپ كىرگۈزۈڭ.\n"
+"ئەگەر بۇنداق ئاتىڭىز بولمىسا <a href=\"http://www.facebook.com/username/\">بۇ يەرگە</a> بېرىپ، Facebook دىكى ئىشلەتكۈچى ئاتىڭىزنى تاللاڭ."
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "Facebook دىكى ئىمىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+msgid "What is your Google ID?"
+msgstr "Google دىكى كىملىكىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "<b>Example:</b> user@gmail.com"
 msgstr "<b>مىسال:</b> user@gmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google password?"
+msgstr "Google دىكى ئىمىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "<b>Example:</b> user@jabber.org"
 msgstr "<b>مىسال:</b> user@jabber.org"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "شىفىرلاش زۆرۈر(TLS/SSL)(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "I_gnore SSL certificate errors"
 msgstr "SSL ئىسپاتنامىسىدىكى خاتالىققا پەرۋا قىلما(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "مۇلازىمېتىر تەڭشىكىنى قاپلاش"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "Priori_ty:"
 msgstr "ئالدىنلىقى(_T):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Reso_urce:"
 msgstr "مەنبە(_U):"
 
-#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid ""
-"This is your username, not your normal Facebook login.\n"
-"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
-"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
-"Facebook username if you don't have one."
-msgstr ""
-"بۇ سىزنىڭ ئىشلەتكۈچى ئاتىڭىزدۇر. Facebook قا كىرىشتە ئىشلىتىدىغىنى ئەمەس.\n"
-" ئەگەر سىز Facebook دا facebook.com/<b>badger</b> بولسىڭىز، <b>badger</b> "
-"دەپ كىرگۈزۈڭ.\n"
-"ئەگەر بۇنداق ئاتىڭىز بولمىسا <a href=\"http://www.facebook.com/username/"
-"\">بۇ يەرگە</a> بېرىپ، Facebook دىكى ئىشلەتكۈچى ئاتىڭىزنى تاللاڭ."
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "كونا SS_L نى ئىشلەت"
-
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "What is your Facebook password?"
-msgstr "Facebook دىكى ئىمىڭىز؟"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "شىفىرلاش زۆرۈر(TLS/SSL)(_Y)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Facebook دىكى ئاتىڭىز؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
-msgid "What is your Google ID?"
-msgstr "Google دىكى كىملىكىڭىز؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
-msgid "What is your Google password?"
-msgstr "Google دىكى ئىمىڭىز؟"
+msgid "Use old SS_L"
+msgstr "كونا SS_L نى ئىشلەت"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "مۇلازىمېتىر تەڭشىكىنى قاپلاش"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Jabber دىكى كىملىكىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Jabber دىكى ئىمىڭىز؟"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Jabber دىكى ئارزۇ قىلغان كىملىكىڭىز نېمە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Jabber دىكى ئىمىڭىز؟"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Jabber دىكى ئارزۇ قىلغان ئىمىڭىز نېمە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>مىسال:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Windows Live دىكى كىملىكىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Windows Live دىكى ئىمىڭىز؟"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ئېلخەت ئادرېسى(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "لەقىمى(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "تەگاتى(_L):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "ئاتى(_F):"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "ئېلان قىلغان ئاتى(_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "Jabber كىملىكى(_J):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "تەگاتى(_L):"
+msgid "E-_mail address:"
+msgstr "ئېلخەت ئادرېسى(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "ئېلان قىلغان ئاتى(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "ئىشلەتكۈچى ئاتى(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>مىسال:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "سالاھىيەت دەلىللەشتە ئىشلىتىدىغان ئىشلەتكۈچى ئاتى:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Binding نى بايقاش"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "STUN مۇلازىمېتىرىنى ئاپتوماتىك تاپىدۇ"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "بۇ ھېساباتنى ئۆي تېلېفونلىرى ۋە يانفونلارغا تېلېفون قىلىش ئۈچۈن ئىشلەت(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "TLS خاتلىقلىرىغا پەرۋا قىلما"
+msgid "NAT Traversal Options"
+msgstr "NAT Traversal تاللانمىلىرى"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "ئىنتېرۋال(سېكۇنت)"
+msgid "Proxy Options"
+msgstr "ۋاكالەتچى تاللانمىلىرى"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive تاللانمىسى"
+msgid "Miscellaneous Options"
+msgstr "باشقا تاللانمىلار"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ئازادە يول باشلاش"
+msgid "STUN Server:"
+msgstr "STUN مۇلازىمېتىرى:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "مېخانىزمى:"
+msgid "Discover the STUN server automatically"
+msgstr "STUN مۇلازىمېتىرىنى ئاپتوماتىك تاپىدۇ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "باشقا تاللانمىلار"
+msgid "Discover Binding"
+msgstr "Binding نى بايقاش"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT Traversal تاللانمىلىرى"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "مۇلازىمېتىر:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive تاللانمىسى"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "ئېغىز:"
+msgid "Mechanism:"
+msgstr "مېخانىزمى:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "ۋاكالەتچى تاللانمىلىرى"
+msgid "Interval (seconds)"
+msgstr "ئىنتېرۋال(سېكۇنت)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "سالاھىيەت دەلىللەشتە ئىشلىتىدىغان ئىشلەتكۈچى ئاتى:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "توشۇش:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN مۇلازىمېتىرى:"
+msgid "Loose Routing"
+msgstr "ئازادە يول باشلاش"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "مۇلازىمېتىر:"
+msgid "Ignore TLS Errors"
+msgstr "TLS خاتالىقلىرىغا پەرۋا قىلما"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "توشۇش:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "What is your SIP account password?"
-msgstr "SIP ھېساباتىڭىزنىڭ ئىمى نېمە؟"
+msgid "Port:"
+msgstr "ئېغىز:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "What is your SIP login ID?"
 msgstr "SIP ھېساباتىڭىزنىڭ كىملىكى نېمە؟"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid "_Username:"
-msgstr "ئىشلەتكۈچى ئاتى(_U):"
+msgid "What is your SIP account password?"
+msgstr "SIP ھېساباتىڭىزنىڭ ئىمى نېمە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "ياخۇ (Yahoo! ID) كىملىكى:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "يىغىن ۋە سۆھبەتخانا تەكلىپىگە پەرۋا قىلما"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ئۆيلەر تىزىمىنىڭ ئورنى:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ياخۇ (Yahoo! ID) كىملىكىڭىز نېمە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ياخۇ (Yahoo! ID) ئىمىڭىز نېمە؟"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "ياخۇ (Yahoo! ID) كىملىكى:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ئۆيلەر تىزىمىنىڭ ئورنى:"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:474
-#: ../libempathy-gtk/empathy-avatar-chooser.c:559
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "رەسىمنى ئايلاندۇرالمىدى"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:475
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
 msgid "None of the accepted image formats are supported on your system"
 msgstr "قوبۇل قىلغان رەسىملەرنىڭ فورماتىنى سىستېمىڭىز قوللىمايدىكەن"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:822
-msgid "Couldn't save pixbuf to png"
-msgstr "pixbuf نى "
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#| msgid "Couldn't save pixbuf to png"
+msgid "Couldn't save picture to file"
+msgstr "رەسىمنى ھۆججەتكە ساقلىغىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:938
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "باش سۈرىتىڭىزنى تاللاڭ"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:942
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
 msgid "Take a picture..."
 msgstr "رەسىمگە تارت…"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:945
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "سۈرەت يوق"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "سۈرەتلەر"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1009
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "ھەممە ھۆججەتلەر"
 
@@ -1256,7 +1273,7 @@ msgid "Click to enlarge"
 msgstr "چېكىپ چوڭايتىڭ"
 
 #: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:58
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "چاقىرىشنى باشلاشتا خاتالىق كۆرۈلدى."
 
@@ -1274,196 +1291,206 @@ msgstr "تاللانغان ئالاقەداش ئىناۋەتسىز"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
-msgstr "بۇ كېلىشىمدە جىددىي چاقىش قىلغىلى بولمايدۇ"
+msgstr "بۇ كېلىشىمدە جىددىي چاقىرىش قىلغىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:695
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "خۇسۇسىي سۆھبەت باشلاش مەغلۇپ بولدى"
 
-#: ../libempathy-gtk/empathy-chat.c:756
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "بۇ سۆھبەت تېمىسىنى قوللىمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:762
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "سۆھبەت تېمىسىنى ئۆزگەرتەلمەيسىز"
 
-#: ../libempathy-gtk/empathy-chat.c:966
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» ئىناۋەتلىك ئالاقەداش كىملىكى ئەمەس"
 
-#: ../libempathy-gtk/empathy-chat.c:1023
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ھازىرقى سۆھبەتتىكى بارلىق ئۇچۇرلارنى تازىلىۋېتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1026
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: سۆھبەت تېمىسىنى بەلگىلەيدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1029
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>:  يېڭى سۆھبەتخانىغا قوشۇلىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>:  يېڭى سۆھبەتخانىغا قوشۇلىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
-msgstr ""
-"/part [<chat room ID>] [<reason>]: سۆھبەتخانىدىن ئايرىلىدۇ. ھازىرقى "
-"سۆھبەتخانىدىن"
+msgstr "/part [<chat room ID>] [<reason>]: سۆھبەتخانىدىن ئايرىلىدۇ. ھازىرقى سۆھبەتخانىدىن"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: خۇسۇسىي سۆھبەت باشلايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1043
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>:خۇسۇسىي سۆھبەت باشلايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1046
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: ھازىرقى مۇلازىمېتىردىكى لەقىمىنى ئۆزگەرتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1049
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: ھازىرقى سۆھبەتكە ACTION ئۇچۇرى ئەۋەتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1052
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
-msgstr ""
-"/say <message>: ھازىرقى سۆھبەتكە <ئۇچۇر> ئەۋەتىدۇ. بۇ «/» بىلەن باشلانغان "
-"ئۇچۇرنى ئەۋەتىش ئۈچۈن ئىشلىتىلىدۇ. مەسىلەن: \"/say /join يېڭى سۆھبەتخانىغا "
-"قوشۇلۇش ئۈچۈن ئىشلىتىلىدۇ."
+msgstr "/say <message>: ھازىرقى سۆھبەتكە <ئۇچۇر> ئەۋەتىدۇ. بۇ «/» بىلەن باشلانغان ئۇچۇرنى ئەۋەتىش ئۈچۈن ئىشلىتىلىدۇ. مەسىلەن: \"/say /join يېڭى سۆھبەتخانىغا قوشۇلۇش ئۈچۈن ئىشلىتىلىدۇ."
 
-#: ../libempathy-gtk/empathy-chat.c:1057
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
-msgstr "/whois <contact ID>: ئاقەداشقا مۇناسىۋەتلىك ئۇچۇرلارنى كۆرسىتىدۇ"
+msgstr "/whois <contact ID>: ئالاقەداشقا مۇناسىۋەتلىك ئۇچۇرلارنى كۆرسىتىدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
-msgstr ""
-"/help [<command>]: بارلىق ئىشلەتكىلى بولىدىغان پروگراممىلارنى كۆرسىتىدۇ. "
-"ئەگەر <command> بېرىلسە، ئۇنىڭ ئىشلىتىش ئۇسۇلىنى كۆرسىتىدۇ."
+msgstr "/help [<command>]: بارلىق ئىشلەتكىلى بولىدىغان پروگراممىلارنى كۆرسىتىدۇ. ئەگەر <command> بېرىلسە، ئۇنىڭ ئىشلىتىش ئۇسۇلىنى كۆرسىتىدۇ."
 
-#: ../libempathy-gtk/empathy-chat.c:1070
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "ئىشلىتىش ئۇسۇلى：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "نامەلۇم بۇيرۇق"
 
-#: ../libempathy-gtk/empathy-chat.c:1235
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
-msgstr ""
-"نامەلۇم بۇيرۇق؛ /help نى ئىشلىتىپ ئىشلەتكىلى بولىدىغان بۇيرۇقلارنى كۆرۈپ "
-"بېقىڭ"
+msgstr "نامەلۇم بۇيرۇق؛ /help نى ئىشلىتىپ ئىشلەتكىلى بولىدىغان بۇيرۇقلارنى كۆرۈپ بېقىڭ"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1393
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "ئۇچۇرنى ئەۋەتىشكە يېتەرلىك قالدۇق پۇل يوق"
 
-#: ../libempathy-gtk/empathy-chat.c:1395
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "ئۇچۇر %s' نى يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
+#, c-format
+msgid "Error sending message: %s"
+msgstr "ئۇچۇر يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1576
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "قىلالمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1402
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "توردا يوق"
 
-#: ../libempathy-gtk/empathy-chat.c:1405
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "ئىناۋەتسىز ئالاقەداش"
 
-#: ../libempathy-gtk/empathy-chat.c:1408
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "ھوقۇقىڭىز يەتمىدى"
 
-#: ../libempathy-gtk/empathy-chat.c:1411
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "ئۇچۇر بەك ئۇزۇن"
 
-#: ../libempathy-gtk/empathy-chat.c:1414
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "تېخى ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:1418
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "نامەلۇم"
 
-#: ../libempathy-gtk/empathy-chat.c:1424
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "ئۇچۇر %s' نى يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1428
-#, c-format
-msgid "Error sending message: %s"
-msgstr "ئۇچۇر يوللاۋاتقاندا خاتالىق كۆرۈلدى: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1489 ../src/empathy-chat-window.c:760
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "سۆھبەت تېمىسى:"
 
-#: ../libempathy-gtk/empathy-chat.c:1501
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "سۆھبەت تېمىسىنى بەلگىلەش: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1503
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr ""
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "سۆھبەت تېمىسى بەلگىلەنمىگەن"
 
-#: ../libempathy-gtk/empathy-chat.c:2010
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(تەۋسىيىلەر يوق)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2078
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "'%s' نى لۇغەتكە قوشۇش"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2115
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s' نى لۇغەت %s غا قوشۇش"
 
-#: ../libempathy-gtk/empathy-chat.c:2172
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "چىراي ئىپادىسى قىستۇرۇش"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2190
-#: ../libempathy-gtk/empathy-ui-utils.c:1756
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "يوللا(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2225
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "نامزات سۆزلەر(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2314
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "يېقىنقى خاتىرىلەرنى ئوقۇش مەغلۇپ بولدى"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ئۈزۈلدى"
@@ -1471,12 +1498,12 @@ msgstr "%s ئۈزۈلدى"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2432
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s نى %2$s چىقىرىۋەتتى"
 
-#: ../libempathy-gtk/empathy-chat.c:2435
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s چىقىرىۋېتىلدى"
@@ -1484,17 +1511,17 @@ msgstr "%s چىقىرىۋېتىلدى"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2443
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s نى %2$s چەكلىگەن"
 
-#: ../libempathy-gtk/empathy-chat.c:2446
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s چەكلەنگەن"
 
-#: ../libempathy-gtk/empathy-chat.c:2450
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ئۆيدىن چىقىپ كەتتى"
@@ -1504,570 +1531,507 @@ msgstr "%s ئۆيدىن چىقىپ كەتتى"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2459
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2484
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ئۆيگە كىردى"
 
-#: ../libempathy-gtk/empathy-chat.c:2509
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s نى ھازىر %s دەپ قارايدۇ"
 
-#: ../libempathy-gtk/empathy-chat.c:2648
-#: ../src/empathy-streamed-media-window.c:1935
-#: ../src/empathy-event-manager.c:1261 ../src/empathy-call-window.c:1869
+#. 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:2993 ../src/empathy-event-manager.c:1197
+#: ../src/empathy-call-window.c:1502 ../src/empathy-call-window.c:1552
+#: ../src/empathy-call-window.c:2588
 msgid "Disconnected"
 msgstr "ئۈزۈلدى"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3316
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "بۇ ئىمنى ساقلاپ قويسۇنمۇ؟"
 
-#: ../libempathy-gtk/empathy-chat.c:3322
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "ئەستە ساقلا"
 
-#: ../libempathy-gtk/empathy-chat.c:3332
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "ھازىرچە ياق"
 
-#: ../libempathy-gtk/empathy-chat.c:3376
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "قايتا سىنا"
 
-#: ../libempathy-gtk/empathy-chat.c:3380
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "ئىم خاتا: قايتا سىناڭ:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3510
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "بۇ ئۆي ئىم ئارقىلىق قوغدالغان:"
 
-#: ../libempathy-gtk/empathy-chat.c:3537
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "كىرىش"
 
-#: ../libempathy-gtk/empathy-chat.c:3739 ../src/empathy-event-manager.c:1282
-#: ../src/empathy-call-window.c:2125
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1218
 msgid "Connected"
-msgstr "ئۇلاندى"
+msgstr "باغلاندى"
 
-#: ../libempathy-gtk/empathy-chat.c:3794
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "سۆھبەت"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3799
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:423
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "نامەلۇم ياكى ئىناۋەتسىز كىملىك"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:425
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "ئالاقەداشنى چەكلەشنى ھازىرچە ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:427
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "ئالاقەداشنى چەكلەشنى ئىشلەتكىلى بولمايدۇ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:429
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ھوقۇق يەتمىدى"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:433
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "ئالاقەداشنى چەكلىگىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:702
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "چەكلەنگەن ئالاقەداشنى تەھرىرلەش"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:521
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1495
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-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
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "ھېسابات:"
 
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+#| msgid "_Blocked Contacts"
+msgid "Blocked Contacts"
+msgstr "چەكلەنگەن ئالاقەداشلار"
+
+#: ../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
+#: ../src/empathy-chatrooms-window.ui.h:3
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "چىقىرىۋەت"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-theme-adium.c:1264
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "ئۇلانما ئاتىنى كۆچۈر(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-theme-adium.c:1271
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "ئۇلانما ئاچ(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "ئالاقەداش ئۇچۇرىنى تەھرىرلەش"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "شەخسىي ئۇچۇرلارنى"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "يېڭى دوست"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "%s نى چەكلىسۇنمۇ؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
+#: ../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 "«%s» نىڭ سىز بىلەن ئالاقە قىلىشىنى راستلا چەكلىسۇنمۇ؟"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "چەكلە(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
+#: ../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] "ئالاقەداشنى نىيىتى توغرا ئەمەس دەپ مەلۇم قىل(_R)"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "كېيىن بىر گەپ بولسۇن(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "مۇشتەرى ئىلتىماسى"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "ئىشلەتكۈچىنى چەكلە(_B)"
 
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "گۇرۇپپىلانمىغان"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ئامراق ئادەملەر"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1983
-#: ../libempathy-gtk/empathy-individual-view.c:2375
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "«%s» دېگەن گۇرۇپپىنى راستلا چىقىرىۋېتەمسىز؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1985
-#: ../libempathy-gtk/empathy-individual-view.c:2378
-msgid "Removing group"
-msgstr "گۇرۇپپا ئۆچۈرۈۋاتىدۇ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2034
-#: ../libempathy-gtk/empathy-contact-list-view.c:2111
-#: ../libempathy-gtk/empathy-individual-view.c:2433
-#: ../libempathy-gtk/empathy-individual-view.c:2636
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Remove"
-msgstr "ئۆچۈر(_R)"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2064
-#: ../libempathy-gtk/empathy-individual-view.c:2500
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "«%s» دېگەن ئالاقەداشنى راستلا چىقىرىۋېتەمسىز؟"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2066
-#: ../libempathy-gtk/empathy-individual-view.c:2521
-msgid "Removing contact"
-msgstr "ئالاقەداشلارنى ئۆچۈرۈۋاتىدۇ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact…"
-msgstr "ئالاقەداش قوش(_A)…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "ئالاقەداش چەكلە(_B)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:547
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Chat"
-msgstr "سۆھبەت(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:638
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "ئاۋازلىق سۆزلەش(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:682
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "سىنلىق سۆزلەش(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:725
-#: ../src/empathy-main-window.ui.h:27
-msgid "_Previous Conversations"
-msgstr "ئالدىنقى سۆھبەتلەر(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:766
-msgid "Send File"
-msgstr "ھۆججەت ئەۋەتىش"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:808
-msgid "Share My Desktop"
-msgstr "ئۈستەلئۈستىنى ھەمبەھىر قىلىش"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1890
-#: ../libempathy-gtk/empathy-individual-menu.c:843
-#: ../libempathy-gtk/empathy-individual-widget.c:1386
-msgid "Favorite"
-msgstr "يىغقۇچ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:871
-msgid "Infor_mation"
-msgstr "ئۇچۇر(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "تەھرىر(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1058
-#: ../src/empathy-chat-window.c:1010
-msgid "Inviting you to this room"
-msgstr "سىزنى بۇ ئۆيگە تەكلىپ قىلىۋاتىدۇ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1104
-msgid "_Invite to Chat Room"
-msgstr "سۆھبەتخانىغا تەكلىپ قىل(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "كېيىن بىر گەپ بولسۇن(_L)"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:514
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ئالاقەداشلارنى ئىزدەش"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:544
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "ئىزدە: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "ئالاقەداش قوش(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:620
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "ئالاقەداش تېپىلمىدى"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ئالاقەداش تاللايدۇ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "تولۇق ئاتى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "تېلېفون نومۇرى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ئېلخەت ئادرېس"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "تور بېكىتى:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "ئۆزىڭىزنى تونۇشتۇرىدىغان ئۇچۇر:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "تۇغۇلغان كۈنى:"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "توردا بار ۋاقتىڭىزدا مەن سىزنى كۆرەلەيدىغان بولاي. تەشەككۈرلەر!"
 
-#. 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-contact-widget.c:346
-msgid "Last seen:"
-msgstr "ئەڭ ئاخىرقى كۆرۈنگەن ۋاقتى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "باغلانغان يەر:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "جايىدا يوق ئۇچۇرى:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "قانال:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "دۆلەتنىڭ ISO كودى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "دۆلەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ھالەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "شەھەر:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "رايون:%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "پوچتا نومۇرى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "كوچا:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "بىنا:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "قەۋەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ئۆي:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "تېكىست:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "چۈشەندۈرۈش:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "توغرىلىق دەرىجىسى"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "خاتالىق:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:525
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "تىك يۆنىلىشتىكى خاتالىقى(مېتىر):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:527
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "توغرا يۆنىلىشتىكى خاتالىقى(مېتىر):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:529
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "سۈرئەت:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:531
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "يۆنىلىش:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:533
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "يامىشىش تېزلىكى:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:535
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "ئاخىرقى يېڭىلانغان:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:537
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "مېرىدىئان(ئۇزۇنلۇق):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:945
-#: ../libempathy-gtk/empathy-individual-widget.c:539
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "كەڭلىك:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:947
-#: ../libempathy-gtk/empathy-individual-widget.c:541
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "ئېگىزلىك(دېڭىز يۈزىدىن):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-#: ../libempathy-gtk/empathy-contact-widget.c:1015
-#: ../libempathy-gtk/empathy-individual-widget.c:629
-#: ../libempathy-gtk/empathy-individual-widget.c:644
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "ئورنى"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1017
-#: ../libempathy-gtk/empathy-individual-widget.c:646
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s، %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1069
-#: ../libempathy-gtk/empathy-individual-widget.c:695
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e، %Y at %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1151
-#: ../libempathy-gtk/empathy-individual-widget.c:931
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "باش سۈرىتىنى ساقلاش"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1207
-#: ../libempathy-gtk/empathy-individual-widget.c:989
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "باش سۈرىتىنى ساقلىغىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>ئورۇن</b> ۋاقتى (چېسلا)\t"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "شەخسىي تەپسىلاتلار"
 
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1321
-msgid "Alias:"
-msgstr "تەخەللۇس:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "خېرىدار تەپسىلاتلىرى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "خېرىدار ئۇچۇرى"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "تولۇق ئاتى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "خېرىدار:"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "تېلېفون نومۇرى"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "خېرىدار تەپسىلاتى"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "ئېلخەت ئادرېسى"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "تورتۇرا"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "تۇغۇلغان كۈن"
+
+#. 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 "ئەڭ ئاخىرقى كۆرۈنگەن ۋاقتى:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "باغلانغان يەر:"
+
+#. 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 "جايىدا يوق ئۇچۇرى:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Network"
+msgid "work"
+msgstr "خىزمەت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "باش بەت"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Profile"
+msgid "mobile"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr ""
 
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1525
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
-msgstr "بەلگە:"
+msgstr "كىملىك:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "تەخەللۇس:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ئورۇن</b> ۋاقتى (چېسلا)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requested…"
 msgstr "ئۇچۇر تەلەپ قىلىندى…"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "خېرىدار ئۇچۇرى"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "نەشرى:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "خېرىدار:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "گۇرۇپپىلار"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
-msgstr ""
-"بۇ ئالاقەداشنى قوشىدىغان گۇرۇپپىنى تاللاڭ. دىققەت: بىر ياكى بىر نەچچىنى "
-"تاللىيالايسىز، ھەتتا تاللىمىسىڭىزمۇ بولىدۇ."
+msgstr "بۇ ئالاقەداشنى قوشىدىغان گۇرۇپپىنى تاللاڭ. دىققەت: بىر ياكى بىر نەچچىنى تاللىيالايسىز، ھەتتا تاللىمىسىڭىزمۇ بولىدۇ."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "گۇرۇپپا قوش(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "تاللا"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1835
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "گۇرۇپپا"
 
@@ -2081,63 +2045,154 @@ msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "تۆۋەندىكى كىملىكلەرنى چەكلىگىلى بولمىدى:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "ئۇلانغان ئالاقەداشلار"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "ئۇلايدىغان ئالاقەداشنى تاللاش"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "يېڭى ئالاقەداشنى ئالدىن كۆرۈش"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "تىزىمدا تاللانغان ئالاقەداشلار ئوز-ئارا ئۇلىنىدۇ."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "ئالاقەداش ئۇچۇرىنى تەھرىرلەش"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:137
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:593
-#: ../libempathy-gtk/empathy-new-message-dialog.c:248
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+msgid "Select account to use to place the call"
+msgstr "تېلېفون قىلىشتا ئىشلىتىدىغان ھېساباتنى تاللاش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "چاقىر"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+#| msgid "Profile"
+msgid "Mobile"
+msgstr "يانفون"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "ئىش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "ئۆي"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "ئالاقەداش چەكلە(_B)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "سۆھبەت(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:919
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "ئاۋازلىق سۆزلەش(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "سىنلىق سۆزلەش(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "ئالدىنقى سۆھبەتلەر(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ھۆججەت ئەۋەتىش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "ئۈستەلئۈستىنى ھەمبەھىر قىلىش"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "يىغقۇچ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ئورنىتىلمىغان"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "ئۇچۇر(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:945
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "ئالاقەداشلارنى ئۇلاش(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "سىزنى بۇ ئۆيگە تەكلىپ قىلىۋاتىدۇ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "سۆھبەتخانىغا تەكلىپ قىل(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "ئالاقەداش قوش(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2340
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "ئۆچۈرۈش ۋە چەكلەش(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2509
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "«%s» دېگەن گۇرۇپپىنى راستلا چىقىرىۋېتەمسىز؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "گۇرۇپپا ئۆچۈرۈۋاتىدۇ"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "ئۆچۈر(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "«%s» دېگەن ئالاقەداشنى راستلا چىقىرىۋېتەمسىز؟"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, 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 ""
-"ئۇلانغان ئالاقەداش «%s» نى راستلا چىقىرىۋېتەمسىز؟ بۇنداقتا بۇنىڭغا ئۇلانغان "
-"باشقا بارلىق ئالاقەداشلارمۇ چىقىرىۋېتىلىدۇ."
+msgstr "ئۇلانغان ئالاقەداش «%s» نى راستلا چىقىرىۋېتەمسىز؟ بۇنداقتا بۇنىڭغا ئۇلانغان باشقا بارلىق ئالاقەداشلارمۇ چىقىرىۋېتىلىدۇ."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "ئالاقەداشلارنى ئۆچۈرۈۋاتىدۇ"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1672
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2147,23 +2202,23 @@ msgstr[0] "ئۇلانغان ئالاقەداشنىڭ %u ئالاقەداشى ب�
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ئورۇن</b> ۋاقتى (چېسلا)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "يانفون ياكى يۆتكەلمە ئۈسكىنىدىن تورغا باغلىنىش"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "يەڭ تور"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "IRC تورىنى تاللاش"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "تور تىزىمىنى ئەسلىگە قايتۇرۇش(_N)"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "تاللا"
@@ -2176,239 +2231,273 @@ msgstr "يېڭى مۇلازىمېتىر"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "ئالاقەداشلارنى ئۇلاش"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "ئۈزۈش(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr ""
-"كۆرسىتىلگەن ئۇلانغان ئالاقەداشلارنى ئۇلانمىغان، ئايرىم-ئايرىم ئالاقەداشقا "
-"پارچىلايدۇ."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "ئۇلانما(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ئۇلانغان ئالاقەداش «%s» نى ئۇزسۇنمۇ؟"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"ئۇلانغان ئالاقەداشلارنى راستلا ئۈزەمسىز؟ بۇنداقتا ئۇلانغان باشقا بارلىق "
-"ئالاقەداشلار ئايرىم-ئايرىم ئالاقەداشقا ئايلىنىپ كېتىدۇ."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "ئۈز(_U)"
+#: ../libempathy-gtk/empathy-log-window.c:620
+msgid "History"
+msgstr "تارىخ"
 
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "كۆرسەت"
 
-#: ../libempathy-gtk/empathy-log-window.c:527
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "ئىزدە"
 
-#: ../libempathy-gtk/empathy-log-window.c:745
-#: ../libempathy-gtk/empathy-log-window.c:859
-msgctxt "A date with the time"
-msgid "%A, %e %B %Y %X"
-msgstr "%A، %e %B %Y %X"
+#: ../libempathy-gtk/empathy-log-window.c:1148
+#, c-format
+#| msgid "Chat with %s"
+msgid "Chat in %s"
+msgstr "%s نىڭدا سۆزلىشىۋاتىدۇ"
 
-#: ../libempathy-gtk/empathy-log-window.c:747
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "%s بىلەن سۆزلىشىش"
 
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%A، %e %B %Y %X"
+
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:814
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:822
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:878
-#: ../libempathy-gtk/empathy-log-window.c:880 ../src/empathy-ft-manager.c:1026
-msgid "%"
-msgstr "%"
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+#| msgid "%d second ago"
+#| msgid_plural "%d seconds ago"
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s سېكۇنت"
 
-#: ../libempathy-gtk/empathy-log-window.c:887
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#, c-format
+#| msgid "%d minute ago"
+#| msgid_plural "%d minutes ago"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s مىنۇت"
+
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "سۆزلەشكەن ۋاقىت %s، ئاخىرلاشقان ۋاقىت %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1213
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "بۈگۈن"
 
-#: ../libempathy-gtk/empathy-log-window.c:1217
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "تۈنۈگۈن"
 
-#: ../libempathy-gtk/empathy-log-window.c:1233
-msgctxt ""
-"A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+#| msgctxt ""
+#| "A date such as '23 May 2010', %e is the day, %B the month and %Y the year"
+#| msgid "%e %B %Y"
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1314
-#: ../libempathy-gtk/empathy-log-window.c:2680
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "خالىغان چاغدا"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
-#: ../libempathy-gtk/empathy-log-window.c:1688
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "ھەركىم"
 
-#: ../libempathy-gtk/empathy-log-window.c:1953
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "كىم"
 
-#: ../libempathy-gtk/empathy-log-window.c:2156
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "قاچان"
 
-#: ../libempathy-gtk/empathy-log-window.c:2272
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "ھېچنېمە"
 
-#: ../libempathy-gtk/empathy-log-window.c:2274
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
-msgstr "تېكىستلىق سۆزلىشىش"
+msgstr "تېكىستلىك سۆزلىشىش"
 
-#: ../libempathy-gtk/empathy-log-window.c:2276
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2281
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "كىرگەن چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2282
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "چىققان چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2283
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "سۆزلەشمىگەن چاقىرىشلار"
 
-#: ../libempathy-gtk/empathy-log-window.c:2304
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "نېمە"
 
-#: ../libempathy-gtk/empathy-log-window.c:2917
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "بۇرۇنقى سۆزلىشىش خاتىرىسىنىڭ ھەممىسىنى ئۆچۈرۈۋېتەمسىز؟"
 
-#: ../libempathy-gtk/empathy-log-window.c:2921
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "ھەممىنى تازىلا"
 
-#: ../libempathy-gtk/empathy-log-window.c:2928
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "دىن ئۆچۈر:"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-#: ../src/empathy-streamed-media-window.c:1340
-msgid "Call"
-msgstr "چاقىر"
+msgid "_File"
+msgstr "ھۆججەت(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "سۆھبەت"
+#: ../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 "تەھرىر(_E)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "History"
-msgstr "تارىخ"
+msgid "Delete All History..."
+msgstr "بارلىق ئىزلارنى ئۆچۈرۈش…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "سەپلىمە ھۆججەت"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-call-window.ui.h:20
-msgid "Video"
-msgstr "سىن"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:20
-msgid "_Edit"
-msgstr "تەھرىر(_E)"
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "پاراڭ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-msgid "_File"
-msgstr "ھۆججەت(_F)"
+#: ../src/empathy-call-window.ui.h:26
+msgid "Video"
+msgstr "سىن"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
 msgid "page 2"
 msgstr "2-بەت"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ئالاقەداش كىملىكى:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ئوقۇۋاتىدۇ...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:258
-msgid "C_hat"
-msgstr "سۆھبەت(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "ھوقۇقىڭىز يەتمىدى"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr ""
+
+#: ../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 ""
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:277
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "يېڭى سۆھبەت"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:216
-msgid "Send _Video"
-msgstr "سىن ئەۋەت(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "سىنلىق سۆزلەش(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:224
-msgid "C_all"
-msgstr "چاقىر(_A)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "ئاۋازلىق سۆزلەش(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:234
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "يېڭى چاقىرىش"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr ""
+
+#: ../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 ""
-"تۆۋەندىكى ھېساباتىڭىزنىڭ ئىمىنى كىرگۈزۈڭ\n"
+msgstr "تۆۋەندىكى ھېساباتىڭىزنىڭ ئىمىنى كىرگۈزۈڭ\n"
 "<b>%s</b>"
 
 #. COL_STATUS_TEXT
@@ -2417,34 +2506,30 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:170
-#: ../libempathy-gtk/empathy-presence-chooser.c:206
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
 msgstr "ئىختىيارىي ئۇچۇر..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "ئىختىيارىي ئۇچۇرنى تەھرىرلەش..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:348
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
 msgstr "چەكسىڭىز بۇ ھالەتنى ئامراق ھالەتتىن چىقىرىۋېتىدۇ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:357
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
 msgstr "چەكسىڭىز بۇ ھالەتنى ئامراق ھالەت قىلىدۇ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:391
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "ھالەتنى تەڭشەش"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:946
-msgid "Set your presence and current status"
-msgstr "سىزنىڭ ھازىرقى ھالىتىڭىزنى بېكىتىدۇ"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1134
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messages…"
 msgstr "ئىختىيارىي ئۇچۇر..."
 
@@ -2452,30 +2537,33 @@ msgstr "ئىختىيارىي ئۇچۇر..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "يېڭى %s ھېساباتى"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
-msgid "Find Next"
-msgstr "كېيىنكىنى ئىزدە"
+msgid "Find:"
+msgstr "ئىزدە:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Find Previous"
-msgstr "كېيىنكىنى ئىزدە"
+#| msgid "_Previous Tab"
+msgid "_Previous"
+msgstr "ئالدىنقى(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Find:"
-msgstr "ئىزدە:"
+#| msgid "_Next Tab"
+msgid "_Next"
+msgstr "كېيىنكى(_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
-msgid "Match case"
-msgstr "دەل ماسلاش"
+#| msgid "Match case"
+msgid "Mat_ch case"
+msgstr "چوڭ كىچىكلىكىگە ماسلاش(_C)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
-msgstr "ئىبارە تېپىلمىدى"
+msgstr "ئاتالغۇنى تاپالمىدى"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2517,39 +2605,33 @@ msgstr "چىققان ئاۋازلىق چاقىرىش"
 msgid "Voice call ended"
 msgstr "ئاۋازلىق چاقىرىش ئاخىرلاشتى"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "ئىختىيارى ئۇچۇر كىرگۈزۈش"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
 msgstr "ئىختىيارىي ئۇچۇرنى تەھرىرلەش"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Save _New Status Message"
-msgstr "يېڭى ھالەت ئۇچۇرىنى ساقلا(_N)"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Status Messages"
-msgstr "ساقلانغان ھالەت ئۇچۇرى"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+#| msgid "Message received"
+msgid "Message edited at %s"
+msgstr "ئۇچۇر %s دە تەھرىرلەندى"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1782
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "نورمال"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:75
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "كلاسسىك"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:76
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "ئاددىي"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:77
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "پاكىز"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:78
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "كۆك"
 
@@ -2575,9 +2657,7 @@ msgstr "ئىسپاتنامىدە ئارزۇ قىلغان بارماق ئىزى �
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:170
 msgid "The hostname verified by the certificate doesn't match the server name."
-msgstr ""
-"ئىسپاتنامە ئارقىلىق تەكشۈرگەن كومپيۇتېر ئاتى مۇلازىمېتىر ئاتى بىلەن "
-"ماسلاشمىدى."
+msgstr "ئىسپاتنامە ئارقىلىق تەكشۈرگەن كومپيۇتېر ئاتى مۇلازىمېتىر ئاتى بىلەن ماسلاشمىدى."
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid "The certificate is self-signed."
@@ -2611,43 +2691,46 @@ msgid "Certificate hostname: %s"
 msgstr "ئىسپاتنامىنىڭ كومپيۇتېر ئاتى: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "داۋاملاشتۇر"
+#| msgid "Continue"
+msgid "C_ontinue"
+msgstr "داۋاملاشتۇر(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "بۇ باغلىنىش ئىشەنچسىز. داۋاملاشتۇرۇۋېرەمسىز؟"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "بۇنى ئەستە ساقلاپ بۇنىڭدىن كېيىنكى باغلىنىشتا ئىشلەت"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "ئىسپاتنامە تەپسىلاتلىرى"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1653
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "URI نى ئاچقىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1748
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
-msgstr "ھۆججەت تاللاش"
+msgstr "بىر ھۆججەت تاللاڭ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1820
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "ھۆججەتنى ساقلايدىغانغا يېتەرلىك بوشلۇق يوق"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1828
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
-msgstr ""
-"بۇ ھۆججەتنى ساقلاش ئۈچۈن %s بوشلۇق كېرەك، بىراق %s بوشلۇق بار ئىكەن. باشقا "
-"يەرگە ساقلاڭ."
+msgstr "بۇ ھۆججەتنى ساقلاش ئۈچۈن %s بوشلۇق كېرەك، بىراق %s بوشلۇق بار ئىكەن. باشقا يەرگە ساقلاڭ."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s دىن كەلگەن ھۆججەت"
@@ -2712,7 +2795,7 @@ msgstr "سلاۋيانچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:224
 msgid "Cyrillic/Russian"
-msgstr "رۇسچە/سلاۋىيان"
+msgstr "رۇسچە/سلاۋيان"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:227
 #: ../libempathy-gtk/totem-subtitle-encoding.c:229
@@ -2721,7 +2804,7 @@ msgstr "سلاۋيانچە/ئۇكرائىنچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:232
 msgid "Georgian"
-msgstr "گرۇزىنچە"
+msgstr "گىرۇزىنچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:235
 #: ../libempathy-gtk/totem-subtitle-encoding.c:237
@@ -2731,7 +2814,7 @@ msgstr "گىرېكچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:242
 msgid "Gujarati"
-msgstr "گۇجاراتى"
+msgstr "گۇجاراتچە"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:245
 msgid "Gurmukhi"
@@ -2819,49 +2902,38 @@ msgstr "غەربچە"
 msgid "Vietnamese"
 msgstr "ۋىيېتنامچە"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "تاللانغان ئالاقەداش ھۆججەتنى تاپشۇرۇپ ئالالمايدۇ."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "تاللانغان ئالاقەداش توردا يوق."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "خاتالىق ئۇچۇرى يوق"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "مۇڭداشقۇ ئۇچۇرى(Empathy)"
 
-#: ../src/empathy.c:309
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "قوزغالغاندا باغلانما"
 
-#: ../src/empathy.c:313
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
-msgstr ""
-"قوزغالغاندا ئالاقەداشلار تىزىمى ياكى باشقا ھېچقانداق سۆزلەشكۈنى كۆرسەتمىسۇن"
+msgstr "قوزغالغاندا ئالاقەداشلار تىزىمى ياكى باشقا ھېچقانداق سۆزلەشكۈنى كۆرسەتمىسۇن"
 
-#: ../src/empathy.c:321
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy مۇڭداشقۇ خېرىدارى"
 
-#: ../src/empathy.c:500
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Account Manager(ھېسابات باشقۇرغۇ) غا باغلىنىۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy.c:502
+#: ../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 ""
-"Telepathy ھېسابات باشقۇرغۇ بىلەن باغلىنىشتا خاتالىق كۆرۈلدى. خاتالىق "
-"تۆۋەندىكىچە:\n"
+msgstr "Telepathy ھېسابات باشقۇرغۇ بىلەن باغلىنىشتا خاتالىق كۆرۈلدى. خاتالىق تۆۋەندىكىچە:\n"
 "\n"
 "%s"
 
@@ -2871,11 +2943,7 @@ msgid ""
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
-msgstr ""
-"Empathy ئەركىن يۇمشاق دېتال؛ سىز ئەركىن يۇمشاق دېتال فوندى تارقاتقان GNU "
-"ئادەتتىكى ئاممىۋى ئىجازەتنامىسىنىڭ ماددىلىرىغا ئاساسەن ئۇنى ئەركىن تارقىتىپ "
-"ياكى ئۆزگەرتسىڭىز بولىدۇ؛  ئىجازەتنامىنىڭ ئىككىنچى نەشرى ياكى ئۇنىڭدىن "
-"كېيىنكى نەشرىنى ئىشلىتىڭ."
+msgstr "Empathy ئەركىن يۇمشاق دېتال؛ سىز ئەركىن يۇمشاق دېتال فوندى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامىسىنىڭ ماددىلىرىغا ئاساسەن ئۇنى ئەركىن تارقىتىپ ياكى ئۆزگەرتسىڭىز بولىدۇ؛  ئىجازەتنامىنىڭ ئىككىنچى نەشرى ياكى ئۇنىڭدىن كېيىنكى نەشرىنى ئىشلىتىڭ."
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2883,922 +2951,642 @@ msgid ""
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
-msgstr ""
-"Empathy نى تارقىتىشنىڭ مەقسىتى ئۇنىڭ سىزگە كېرەكلىك بولۇشى ئۈچۈن، ئەمما "
-"ئۇنىڭ ھېچقانداق كاپالىتى يوق؛ ئۇنى ئىشلىتىپ كېلىپ چىققان ھەر قانداق بىۋاسىتە "
-"ياكى ۋاسىتىلىك ئاقىۋەتكە ھېچقانداق مەسئۇلىيەتنى ئۈستىگە ئالمايمىز. GNU "
-"ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىكى تەپسىلاتنى كۆرۈڭ."
+msgstr "Empathy نى تارقىتىشنىڭ مەقسىتى ئۇنىڭ سىزگە كېرەكلىك بولۇشى ئۈچۈن، ئەمما ئۇنىڭ ھېچقانداق كاپالىتى يوق؛ ئۇنى ئىشلىتىپ كېلىپ چىققان ھەر قانداق بىۋاسىتە ياكى ۋاسىتىلىك ئاقىۋەتكە ھېچقانداق مەسئۇلىيەتنى ئۈستىگە ئالمايمىز. GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىكى تەپسىلاتنى كۆرۈڭ."
 
 #: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
-msgstr ""
-"سىز Empathy بىلەن بىللە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنىڭ "
-"كۆچۈرۈلمىسىدىن بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئەگەر تاپشۇرۇۋالمىغان بولسىڭىز "
-"ئەركىن يۇمشاق دېتال ۋەخپىسىگە خەت يېزىڭ. ئادرېس:  Free Software Foundation,"
-"Inc., 51 Franklin  Street, Fifth Floor, Boston, MA 02110-130159 USA"
+msgstr "سىز Empathy بىلەن بىللە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنىڭ كۆچۈرۈلمىسىدىن بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئەگەر تاپشۇرۇۋالمىغان بولسىڭىز ئەركىن يۇمشاق دېتال ۋەخپىسىگە خەت يېزىڭ. ئادرېس:  Free Software Foundation,Inc., 51 Franklin  Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME دىكى مۇڭداشقۇ خېرىدارى"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
-msgstr ""
-"Launchpad Contributions:\n"
-"  Burkut https://launchpad.net/~burkut\n"
-"  Gheyret T.Kenji https://launchpad.net/~gheyretkenji"
-
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "ھېساباتنى ئىمپورت قىلىۋاتقاندا خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "ھېسابات تەپسىلاتىنى تەھلىل قىلىۋاتقاندا خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "ھېسابات قۇرۇۋاتقاندا خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "خاتالىق كۆرۈلدى."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "خاتالىق ئۇچۇرى: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"سىز كەينىگە قايتىپ ھېسابات قايتا تەپسىلاتىنى كىرگۈزسىڭىز ياكى بۇ ياردەمچىنى "
-"ئاخىرلاشتۇرۇپ، كېيىن «تەھرىر» تىزىملىكى ئارقىلىق ھېسابات قوشسىڭىز بولىدۇ."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
-msgid "An error occurred"
-msgstr "خاتالىق كۆرۈلدى"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "قانداق تىپتىكى ھېساباتىڭىز بار؟"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "يەنە باشقا تەڭشىمەكچى بولغان سۆھبەت ھېساباتىڭىز بارمۇ؟"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "ھېساباتىڭىزنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "قانداق تىپتىكى ھېسابات قۇرغۇڭىز بار؟"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "باشقا مۇڭداشقۇ ھېساباتى قۇرغۇڭىز بارمۇ؟"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "يېڭى ھېساباتنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy ئىشلىتىپ سىز توردىكى قوشنىلىرىڭىز ۋە Google سۆھبەت، AIM، Windows "
-"Live ۋە باشقا سۆھبەت پروگراممىلىرىنى ئىشلىتىدىغان دوست، ساۋاقداشلىرىڭىز "
-"بىلەن مۇڭدىشالايسىز. مىكروفون ۋە تور كامېراسى بولسا ئاۋازلىق ۋە سىنلىق "
-"مۇڭداشقىلىمۇ بولىدۇ."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "باشقا مۇڭداشقۇلاردا ئىشلەتكەن ھېساباتىڭىز بارمۇ؟"
-
-#: ../src/empathy-account-assistant.c:652
-msgid "Yes, import my account details from "
-msgstr "ھەئە، ھېساباتىمنىڭ تەپسىلاتىنى ئىمپورت قىلىمەن "
-
-#: ../src/empathy-account-assistant.c:673
-msgid "Yes, I'll enter my account details now"
-msgstr "ھەئە، ھېساباتىمغا ئائىت تەپسىلاتلارنى كىرگۈزىمەن"
-
-#: ../src/empathy-account-assistant.c:695
-msgid "No, I want a new account"
-msgstr "ياق، يېڭى ھېسابات قۇرغۇم بار"
-
-#: ../src/empathy-account-assistant.c:705
-msgid "No, I just want to see people online nearby for now"
-msgstr "ياق، مېنىڭ يېقىندىكى كىشىلەرنى ھازىرلا كۆرگۈم بار"
-
-#: ../src/empathy-account-assistant.c:726
-msgid "Select the accounts you want to import:"
-msgstr "ئىمپورت قىلماقچى بولغان ھېساباتلارنى تاللاڭ:"
-
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
-msgid "Yes"
-msgstr "ھەئە"
-
-#: ../src/empathy-account-assistant.c:820
-msgid "No, that's all for now"
-msgstr "ياق، ھازىرچە مۇشۇلارلا"
-
-#: ../src/empathy-account-assistant.c:1085
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy سىز بىلەن ئوخشاش توردىكى باشقىلارنى ئىزدەپ تاپالايدۇ ھەم "
-"سۆزلىشەلەيدۇ. بۇ ئىقتىدارىنى ئىشلەتمەكچى بولسىڭىز، تۆۋەندىكى تەپسىلاتلار "
-"توغرىمۇ تەكشۈرۈڭ. بۇ تەپسىلاتلارنى كېيىن ئۆزگەرتكىلى ياكى بۇ ئىقتىدارنى "
-"«ھېسابات» سۆزلەشكۈسىدە چەكلىۋاتقىلىمۇ بولىدۇ."
-
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
-msgid "Edit->Accounts"
-msgstr "تەھرىر->ھېساباتلار"
-
-#: ../src/empathy-account-assistant.c:1107
-msgid "I do _not want to enable this feature for now"
-msgstr "بۇ ئىقتىدارنى ھازىرلا ئىناۋەتلىك قىلغۇم يوق(_N)"
-
-#: ../src/empathy-account-assistant.c:1143
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"ئەگەر telepathy-salut ئورنىتىلمىغان بولسا سىز يەرلىك توردىكى باشقىلار بىلەن "
-"سۆھبەتلىشەلمەيسىز. بۇ ئىقتىدارنى ئىشلەتمەكچى بولسىڭىز telepathy-salut "
-"بوغچىسىنى ئورنىتىڭ ۋە «ھېسابات» سوزلەشكۈسىنى ئىشلىتىپ بىر دانە «قوشنىلار» "
-"ھېساباتىدىن بىرنى قۇرۇڭ."
-
-#: ../src/empathy-account-assistant.c:1149
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut ئورنىتىلمىغان"
-
-#: ../src/empathy-account-assistant.c:1195
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "ئۇچۇر ۋە VoIP ھېساباتلىرى ياردەمچىسى"
-
-#: ../src/empathy-account-assistant.c:1229
-msgid "Welcome to Empathy"
-msgstr "Empathy غا مەرھابا"
-
-#: ../src/empathy-account-assistant.c:1238
-msgid "Import your existing accounts"
-msgstr "ئۆزىڭىزنىڭ ھېساباتلىرىنى ئىمپورت قىلىدۇ"
-
-#: ../src/empathy-account-assistant.c:1256
-msgid "Please enter personal details"
-msgstr "تەپسىلاتىنى كىرگۈزۈڭ"
+msgstr "Gheyret Kenji <gheyret@gmail.com>\n"
+"Sahran<sahran@live.com>"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "سىزنىڭ %s ھېساباتىڭىزدا تېخى ساقلانمىغان ئۆزگىرىشلەر بار."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "يېڭى ھېساباتىڭىز تېخى ساقلانمىدى."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:797 ../src/empathy-call-window.c:780
+#: ../src/empathy-accounts-dialog.c:370 ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "باغلىنىۋاتىدۇ…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "توردا يوق — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "ئۈزۈلدى — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "توردا يوق — تور باغلىنىشى يوق"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "نامەلۇم ھالەت"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "توردا يوق — ھېسابات چەكلەنگەن"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
+#: ../src/empathy-accounts-dialog.c:572
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
 msgstr ""
-"يېڭى ھېسابات قۇرماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
-"ئۆزگىرىشلەر يوق بولۇپ كېتىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr ""
+
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "كومپيۇتېرىڭىزدىن %s نى چىقىرىۋېتەمسىز؟"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "بۇ مۇلازىمېتىردىكى ھېساباتىڭىزنى چىقىرىۋەتمەيدۇ."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
-msgstr ""
-"باشقا ھېساباتنى تاللىماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
+msgstr "باشقا ھېساباتنى تاللىماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
 "ئۆزگىرىشلەر يوق بولۇپ كېتىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "قوزغات(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
-msgstr "قوزغاتما(_D)"
+msgstr "چەكلە(_D)"
+
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "ئۆتكۈزۈۋەت(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2126
+#| msgid "Connected"
+msgid "_Connect"
+msgstr "باغلا(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
-msgstr ""
-"كۆزنەكنى ياپماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
+msgstr "كۆزنەكنى ياپماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
 "ئۆزگىرىشلەر يوق بولۇپ كېتىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Loading account information"
-msgstr "ھېسابات ئۇچۇرىنى ئوقۇۋاتىدۇ"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "No protocol installed"
-msgstr "كېلىشىم ئورنىتىلمىغان"
+#| msgid "_Add…"
+msgid "Add…"
+msgstr "قوشۇش…"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Protocol:"
-msgstr "كېلىشىم:"
+msgid "_Import…"
+msgstr "ئىمپورت قىلىش(_I)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
+msgid "Loading account information"
+msgstr "ھېسابات ئۇچۇرىنى ئوقۇۋاتىدۇ"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
-msgstr ""
-"يېڭى ھېسابات قوشۇش ئۈچۈن، ئالدى بىلەن ئىشلەتمەكچى بولغان كېلىشىمنىڭ نېگىزلىك"
-"(backend) پروگراممىسىنى ئورنىتىشىڭىز كېرەك."
-
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add…"
-msgstr "قوش(_A)…"
+msgstr "يېڭى ھېسابات قوشۇش ئۈچۈن، ئالدى بىلەن ئىشلەتمەكچى بولغان كېلىشىمنىڭ نېگىزلىك(backend) پروگراممىسىنى ئورنىتىشىڭىز كېرەك."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import…"
-msgstr "ئىمپورت قىلىش(_I)…"
+#| msgid "No protocol installed"
+msgid "No protocol backends installed"
+msgstr ""
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy سالاھىيەت دەلىللەش خېرىدارى"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy سالاھىيەت دەلىللەش خېرىدارى"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "قوشنا"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:120
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy ئۈن/سىن خېرىدار پروگراممىسى"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:138
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy ئۈن/سىن خېرىدار پروگراممىسى"
-
-#: ../src/empathy-streamed-media-window.c:478 ../src/empathy-call-window.c:472
-msgid "Contrast"
-msgstr "ئاق-قارىلىقى"
-
-#: ../src/empathy-streamed-media-window.c:481 ../src/empathy-call-window.c:475
-msgid "Brightness"
-msgstr "يورۇقلۇق"
-
-#: ../src/empathy-streamed-media-window.c:484 ../src/empathy-call-window.c:478
-msgid "Gamma"
-msgstr "گامما"
-
-#: ../src/empathy-streamed-media-window.c:589 ../src/empathy-call-window.c:583
-msgid "Volume"
-msgstr "دىسكا"
-
-#: ../src/empathy-streamed-media-window.c:1153
-#: ../src/empathy-call-window.c:1127
-msgid "_Sidebar"
-msgstr "يان بالداق(_S)"
-
-#: ../src/empathy-streamed-media-window.c:1173
-#: ../src/empathy-call-window.c:1149
-msgid "Audio input"
-msgstr "ئۈن كىرگۈزۈش"
-
-#: ../src/empathy-streamed-media-window.c:1177
-#: ../src/empathy-call-window.c:1153
-msgid "Video input"
-msgstr "سىن كىرگۈزۈش"
-
-#: ../src/empathy-streamed-media-window.c:1181
-#: ../src/empathy-call-window.c:1157
-msgid "Dialpad"
-msgstr "نومۇر تاختىسى"
-
-#: ../src/empathy-streamed-media-window.c:1192
-#: ../src/empathy-call-window.c:1167
-msgid "Details"
-msgstr "تەپسىلاتى"
-
-#. 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:1261
-#: ../src/empathy-call-window.c:1239
-#, c-format
-msgid "Call with %s"
-msgstr "%s بىلەن سۆزلىشىش"
-
-#: ../src/empathy-streamed-media-window.c:1494
-#: ../src/empathy-call-window.c:1459
-msgid "The IP address as seen by the machine"
-msgstr "كومپيۇتېردا ئۇچرىغان IP ئادرېسى"
-
-#: ../src/empathy-streamed-media-window.c:1496
-#: ../src/empathy-call-window.c:1461
-msgid "The IP address as seen by a server on the Internet"
-msgstr "ئىنتېرنېتتىكى مۇلازىمېتىردا ئۇچرىغان IP ئادرېسى"
-
-#: ../src/empathy-streamed-media-window.c:1498
-#: ../src/empathy-call-window.c:1463
-msgid "The IP address of the peer as seen by the other side"
-msgstr "قارشى تەرەپتە ئۇچرىغان تەڭتۇش(peer)  IP ئادرېسى"
-
-#: ../src/empathy-streamed-media-window.c:1500
-#: ../src/empathy-call-window.c:1465
-msgid "The IP address of a relay server"
-msgstr "ئۇلاپ تارقىتىش مۇلازىمېتىرىنىڭ IP ئادرېسى"
-
-#: ../src/empathy-streamed-media-window.c:1502
-#: ../src/empathy-call-window.c:1467
-msgid "The IP address of the multicast group"
-msgstr "كۆپ ئادرېسلىق خەۋەرلىشىش گۇرۇپپىسىنىڭ IP ئادرېسى"
-
-#: ../src/empathy-streamed-media-window.c:1884
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/empathy-streamed-media-window.c:1887
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/empathy-streamed-media-window.c:1890
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#: ../src/empathy-streamed-media-window.c:1893
-msgctxt "decoding audio codec"
-msgid "Unknown"
-msgstr "نامەلۇم"
-
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2185
-#, c-format
-msgid "Connected — %d:%02dm"
-msgstr "باغلاندى — %d:%02dm"
-
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:2187
-msgid "Technical Details"
-msgstr "تېخنىكىلىق تەپسىلات"
-
-#: ../src/empathy-streamed-media-window.c:2284
-#: ../src/empathy-call-window.c:2225
-#, c-format
-msgid ""
-"%s's software does not understand any of the audio formats supported by your "
-"computer"
-msgstr ""
-"%s's يۇمشاق دېتالى كومپيۇتېرىڭىزدا بار بولغان ھېچقانداق ئۈن فورماتىنى "
-"تونۇمىدى."
-
-#: ../src/empathy-streamed-media-window.c:2289
-#: ../src/empathy-call-window.c:2230
-#, c-format
-msgid ""
-"%s's software does not understand any of the video formats supported by your "
-"computer"
-msgstr ""
-"%s's يۇمشاق دېتالى كومپيۇتېرىڭىزدا بار بولغان ھېچقانداق سىن فورماتىنى "
-"تونۇمىدى."
-
-#: ../src/empathy-streamed-media-window.c:2295
-#: ../src/empathy-call-window.c:2236
-#, c-format
-msgid ""
-"Can't establish a connection to %s. One of you might be on a network that "
-"does not allow direct connections."
-msgstr ""
-"%s نىڭ بىلەن باغلىنىش قۇرالمىدى. سىزنىڭ ياكى قارىشى تەرەپنىڭ بىۋاسىتە "
-"باغلىنىشقا رۇخسەت قىلىنمىغان بولۇشى مۇمكىن."
-
-#: ../src/empathy-streamed-media-window.c:2301
-#: ../src/empathy-call-window.c:2242
-msgid "There was a failure on the network"
-msgstr "توردا خاتالىق يۈز بەردى"
-
-#: ../src/empathy-streamed-media-window.c:2305
-#: ../src/empathy-call-window.c:2246
-msgid ""
-"The audio formats necessary for this call are not installed on your computer"
-msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان ئۈن فورماتلىرى كومپيۇتېرغا ئورنىتىلماپتۇ"
-
-#: ../src/empathy-streamed-media-window.c:2308
-#: ../src/empathy-call-window.c:2249
-msgid ""
-"The video formats necessary for this call are not installed on your computer"
-msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان سىن فورماتلىرى كومپيۇتېرغا ئورنىتىلماپتۇ"
-
-#: ../src/empathy-streamed-media-window.c:2318
-#: ../src/empathy-call-window.c:2261
-#, c-format
-msgid ""
-"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
-"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
-"the Help menu."
-msgstr ""
-"Telepathy بۆلىكىدە غەلىتىلىك يۈز بەردى. «ياردەم» تىزىملىكىدىكى «سازلاش» "
-"كۆزنىكىدە خاتىرىلىگەن ئۇچۇرلار بىلەن قوشۇپ <a href=\"%s\">بۇ كەمتۈكنى مەلۇم "
-"قىلىڭ</a>."
-
-#: ../src/empathy-streamed-media-window.c:2326
-#: ../src/empathy-call-window.c:2270
-msgid "There was a failure in the call engine"
-msgstr "چاقىرىش ماتورىدا خاتالىق يۈز بەردى"
-
-#: ../src/empathy-streamed-media-window.c:2329
-#: ../src/empathy-call-window.c:2273
-msgid "The end of the stream was reached"
-msgstr "ئېقىم ئاخىرلاشتى"
-
-#: ../src/empathy-streamed-media-window.c:2369
-#: ../src/empathy-call-window.c:2313
-msgid "Can't establish audio stream"
-msgstr "ئۈن ئېقىمىنى قۇرغىلى بولمىدى"
-
-#: ../src/empathy-streamed-media-window.c:2379
-#: ../src/empathy-call-window.c:2323
-msgid "Can't establish video stream"
-msgstr "سىن ئېقىمىنى قۇرغىلى بولمىدى"
-
 #: ../src/empathy-call-window.ui.h:1
-msgid "Audio"
-msgstr "ئۈن"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "ئالاقەداشنى قايتا چاقىرىش"
+msgid "_Call"
+msgstr "چاقىر(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "كامېرا ئېتىك"
+msgid "_Microphone"
+msgstr "مىكروفون(_C)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "كامېرا ئوچۇق"
+#| msgid "Camera On"
+msgid "_Camera"
+msgstr "كامېرا(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "كودسىزلىغۇچ:"
+msgid "_Settings"
+msgstr "تەڭشەك(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "كامېرانى ئىناۋەتسىز قىلىپ سىن يوللاشنى توختىتىدۇ"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+msgid "_View"
+msgstr "كۆرۈنۈش(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "كامېرانى قوزغىتىپ سىن يوللا"
+#: ../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 "ياردەم(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "كامېرانى قوزغات بىراق سىننى يوللىما"
+#: ../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 "مەزمۇنلار(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "كودلىغۇچلار:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "سازلا(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "توختىتىپ قويۇش"
+msgid "Swap camera"
+msgstr "كامېرا ئالماشتۇر"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ھازىرقى سۆزلىشىشنى توختىتىپ قويۇش"
+msgid "Minimise me"
+msgstr "مېنى ئەڭ كىچىك قىل"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "يەرلىك نامزات:"
+msgid "Maximise me"
+msgstr "مېنى ئەڭ چوڭ قىل"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Preview"
-msgstr "ئالدىن كۆزەت"
+#| msgid "_Disable"
+msgid "Disable camera"
+msgstr "كامېرانى ئىناۋەتسىز قىلىش"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Redial"
-msgstr "قايتا چاقىرىش"
+msgid "Hang up"
+msgstr "توختىتىپ قويۇش"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "يىراقتىكى كاندىدات:"
+msgid "Hang up current call"
+msgstr "ھازىرقى سۆزلىشىشنى توختىتىپ قويۇش"
 
 #: ../src/empathy-call-window.ui.h:16
-msgid "Send Audio"
-msgstr "ئۈن ئەۋەتىش"
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "Video call"
+msgstr "سىنلىق سۆزلىشىش"
 
 #: ../src/empathy-call-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "ئۈن تارقىتىشىنى ئالماشتۇرۇش(ئېچىش ياكى ئېتىش)"
-
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-call-window.c:1824
-#: ../src/empathy-call-window.c:1825 ../src/empathy-call-window.c:1826
-#: ../src/empathy-call-window.c:1827
-msgid "Unknown"
-msgstr "نامەلۇم"
+msgid "Start a video call"
+msgstr "سىنلىق سۆزلىشىشنى باشلايدۇ"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "V_ideo"
-msgstr "سىن(_I)"
+msgid "Start an audio call"
+msgstr "ئاۋازلىق سۆزلىشىشنى باشلايدۇ"
+
+#: ../src/empathy-call-window.ui.h:20
+#| msgid "Dialpad"
+msgid "Show dialpad"
+msgstr "نومۇر تاختا كۆرسەت"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Off"
-msgstr "سىن ئېتىك"
+msgid "Display the dialpad"
+msgstr "نومۇر تاختىسىنى كۆرسىتىش"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Video On"
-msgstr "سىن ئوچۇق"
+#| msgid "Send _Video"
+msgid "Send Video"
+msgstr "سىن ئەۋەتىش"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video Preview"
-msgstr "سىننى ئالدىن كۆزىتىش"
+#| msgid "Toggle audio transmission"
+msgid "Toggle video transmission"
+msgstr "سىن تارقىتىشىنى ئالماشتۇرۇش(ئېچىش ياكى ئېتىش)"
 
 #: ../src/empathy-call-window.ui.h:24
-msgid "_Call"
-msgstr "چاقىر(_C)"
+msgid "Send Audio"
+msgstr "ئۈن ئەۋەتىش"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Dialpad"
-msgstr "نومۇر تاختىسى(_D)"
+msgid "Toggle audio transmission"
+msgstr "ئۈن تارقىتىشىنى ئالماشتۇرۇش(ئېچىش ياكى ئېتىش)"
 
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-main-window.ui.h:30
-msgid "_View"
-msgstr "كۆرۈنۈش(_V)"
+#: ../src/empathy-call-window.ui.h:27
+msgid "Encoding Codec:"
+msgstr "كودلىغۇچلار:"
+
+#: ../src/empathy-call-window.ui.h:28 ../src/empathy-call-window.c:2540
+#: ../src/empathy-call-window.c:2541 ../src/empathy-call-window.c:2542
+#: ../src/empathy-call-window.c:2543
+msgid "Unknown"
+msgstr "نامەلۇم"
+
+#: ../src/empathy-call-window.ui.h:29
+msgid "Decoding Codec:"
+msgstr "كودسىزلىغۇچ:"
+
+#: ../src/empathy-call-window.ui.h:30
+msgid "Remote Candidate:"
+msgstr "يىراقتىكى كاندىدات:"
+
+#: ../src/empathy-call-window.ui.h:31
+msgid "Local Candidate:"
+msgstr "يەرلىك نامزات:"
+
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+msgid "Audio"
+msgstr "ئۈن"
+
+#: ../src/empathy-chat-window.c:289
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "بۇ كۆزنەكنى ياپ؟"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
 
-#: ../src/empathy-chat-window.c:480 ../src/empathy-chat-window.c:500
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "كۆزنەك ياپ"
+
+#: ../src/empathy-chat-window.c:334
+#| msgid "Level "
+msgid "Leave room"
+msgstr ""
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d  ئوقۇلمىدى)"
 
-#: ../src/empathy-chat-window.c:492
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ۋە %u باشقىلار)"
 
-#: ../src/empathy-chat-window.c:508
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (باشقىلاردىن %d  ئوقۇلمىدى)"
 
-#: ../src/empathy-chat-window.c:517
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ھەممىسىدىن %d  ئوقۇلمىدى)"
 
-#: ../src/empathy-chat-window.c:732
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:742
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d ئۇچۇرنى ئەۋەتىۋاتىدۇ"
 
-#: ../src/empathy-chat-window.c:764
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "ئۇچۇر كىرگۈزۈۋاتىدۇ."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "تازىلا(_L)"
+msgid "_Conversation"
+msgstr "سۆھبەت(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "ئالاقەداش(_O)"
+msgid "C_lear"
+msgstr "تازىلا(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "چىراي ئىپادىسى قىستۇر(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ئامراق سۆھبەتخانا(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "سۆھبەتداش تەكلىپ قىلىش(_P)…"
+msgid "Notify for All Messages"
+msgstr "ھەممە ئۇچۇرلارنى ئۇقتۇرۇش قىلىش"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "بەتكۈچنى سولغا يۆتكە(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "ئالاقەداش تىزىمىنى كۆرسەت(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "بەتكۈچنى ئوڭغا يۆتكە(_R)"
+msgid "Invite _Participant…"
+msgstr "سۆھبەتداش تەكلىپ قىلىش(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ھەممە ئۇچۇرلارنى ئۇقتۇرۇش قىلىش"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:18
-msgid "_Contents"
-msgstr "مەزمۇنلار(_C)"
+msgid "C_ontact"
+msgstr "ئالاقەداش(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "سۆھبەت(_C)"
+msgid "_Tabs"
+msgstr "بەتكۈچلەر(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "بەتكۈچنى ئايرىۋەت(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ئامراق سۆھبەتخانا(_F)"
-
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:22
-msgid "_Help"
-msgstr "ياردەم(_H)"
+msgid "_Previous Tab"
+msgstr "ئالدىنقى بەتكۈچ(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "كېيىنكى بەتكۈچ(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "ئالدىنقى بەتكۈچ(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "يېپىلغان بەتكۈچنى ئەسلىگە كەلتۈر(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "ئالاقەداش تىزىمىنى كۆرسەت(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "بەتكۈچنى سولغا يۆتكە(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "بەتكۈچلەر(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "بەتكۈچنى ئوڭغا يۆتكە(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "يېپىلغان بەتكۈچنى ئەسلىگە كەلتۈر(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "بەتكۈچنى ئايرىۋەت(_D)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "ئاتى"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "ئۆي"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "ئاپتوماتىك باغلىنىش"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ئامراق ئۆيلەرنى باشقۇرۇش"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:511
 msgid "Incoming video call"
 msgstr "كەلگەن سىنلىق چاقىرىش"
 
-#: ../src/empathy-event-manager.c:542
+#: ../src/empathy-event-manager.c:511 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "سۆزلىشىۋاتىدۇ"
 
-#: ../src/empathy-event-manager.c:546
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s سىزنى چاقىرىۋاتىدۇ(سىنغا).  جاۋاب بېرەمسىز؟"
 
-#: ../src/empathy-event-manager.c:547
+#: ../src/empathy-event-manager.c:516
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s سىزنى چاقىرىۋاتىدۇ. جاۋاب بېرەمسىز؟"
 
-#: ../src/empathy-event-manager.c:550 ../src/empathy-event-manager.c:751
-#: ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:519 ../src/empathy-event-manager.c:720
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s دىن كەلگەن تېلېفون"
 
-#: ../src/empathy-event-manager.c:575
+#: ../src/empathy-event-manager.c:544
 msgid "_Reject"
 msgstr "رەت قىل(_R)"
 
-#: ../src/empathy-event-manager.c:583 ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:552 ../src/empathy-event-manager.c:560
 msgid "_Answer"
 msgstr "جاۋاب بەر(_A)"
 
-#: ../src/empathy-event-manager.c:591
+#: ../src/empathy-event-manager.c:560
 msgid "_Answer with video"
-msgstr " سىنلىق جاۋاب(&A)"
+msgstr "سىنلىق جاۋاب(&A)"
 
-#: ../src/empathy-event-manager.c:751 ../src/empathy-event-manager.c:784
+#: ../src/empathy-event-manager.c:720 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s دىن كەلگەن سىنلىق چاقىرىش"
 
-#: ../src/empathy-event-manager.c:857
+#: ../src/empathy-event-manager.c:778
 msgid "Room invitation"
 msgstr "ئۆيگە تەكلىپ قىلىش"
 
-#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-event-manager.c:780
 #, c-format
 msgid "Invitation to join %s"
-msgstr "%s نىنغا قاتنىشىشقا تەكلىپ قىلىش"
+msgstr "%s نىڭغا قاتنىشىشقا تەكلىپ قىلىش"
 
-#: ../src/empathy-event-manager.c:866
+#: ../src/empathy-event-manager.c:787
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s سىزنى %s غا قاتنىشىشنى تەكلىپ قىلىۋاتىدۇ"
 
-#: ../src/empathy-event-manager.c:874
+#: ../src/empathy-event-manager.c:795
 msgid "_Decline"
 msgstr "رەت قىل(_D)"
 
-#: ../src/empathy-event-manager.c:879
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:800
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "قاتناش(_J)"
 
-#: ../src/empathy-event-manager.c:906
+#: ../src/empathy-event-manager.c:827
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s سىزنى %s غا تەكلىپ قىلدى"
 
-#: ../src/empathy-event-manager.c:912
+#: ../src/empathy-event-manager.c:833
 #, c-format
 msgid "You have been invited to join %s"
-msgstr "سىز %s نىنغا تەكلىپ قىلىندىڭىز"
+msgstr "سىز %s نىڭغا تەكلىپ قىلىندىڭىز"
 
-#: ../src/empathy-event-manager.c:963
+#: ../src/empathy-event-manager.c:884
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s نىڭدىن كەلگەن ھۆججەت"
 
-#: ../src/empathy-event-manager.c:1155 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1064 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "ئىم كىرگۈزۈڭ"
 
-#: ../src/empathy-event-manager.c:1211
+#: ../src/empathy-event-manager.c:1134
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s سىزنى توردا بار چېغىڭىزدا كۆرۈشكە ئىجازەت سوراۋاتىدۇ"
 
-#: ../src/empathy-event-manager.c:1215
+#: ../src/empathy-event-manager.c:1140
 #, c-format
 msgid ""
 "\n"
 "Message: %s"
-msgstr ""
-"\n"
+msgstr "\n"
 "ئۇچۇر: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s،  %s/s نىڭدا"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "\"%s\" نى %s دىن قوبۇل قىلدى"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "«%s» نى %s غا ئەۋەتىۋاتىدۇ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "«%s» نى %s دىن قوبۇل قىلىشتا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ھۆججەت قوبۇل قىلىۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "«%s» نى %s غا يوللاۋاتقاندا خاتالىق كۆرۈلدى"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ھۆججەت يوللاۋاتقاندا خاتالىق كۆرۈلدى"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "\"%s\" نى %s دىن تاپشۇرۇۋالغان"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "\"%s\" نى %s غا يوللايدۇ"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ھۆججەت يوللاش تاماملاندى"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "باشقا قاتناشقۇچىلارنىڭ جاۋابىنى ساقلاۋاتىدۇ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "«%s» نىڭ تولۇقلۇقىنى تەكشۈرۈۋاتىدۇ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "Hash قىممىتىنى ھېسابلاۋاتىدۇ «%s»"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1025
+msgid "%"
+msgstr "%"
+
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ھۆججەت"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "قالدى"
 
@@ -3808,643 +3596,1182 @@ msgstr "ھۆججەت يوللاش"
 
 #: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
-"تىزىمدىن تاماملانغان، ئەمەلدىن قالدۇرۇلغان ۋە مەغلۇپ بولغان ھۆججەت "
-"يوللاشلارنى چىقىرىۋېتىش"
+msgstr "تىزىمدىن تاماملانغان، ئەمەلدىن قالدۇرۇلغان ۋە مەغلۇپ بولغان ھۆججەت يوللاشلارنى چىقىرىۋېتىش"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+#| msgid "Import"
+msgid "_Import"
+msgstr "ئىمپورت قىل(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr ""
-"ئىمپورت قىلىدىغان ھېسابات تېپىلمىدى. Empathy دە ھازىر پەقەتلا Pidgin دىن "
-"ھېسابات ئىمپورت قىلغىلى بولىدۇ."
+msgstr "ئىمپورت قىلىدىغان ھېسابات تېپىلمىدى. Empathy دە ھازىر پەقەتلا Pidgin دىن ھېسابات ئىمپورت قىلغىلى بولىدۇ."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "ھېساباتلارنى ئىمپورت قىلىش"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "ئەكىر"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "كېلىشىم"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "مەنبە"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "ئىم تەمىنلەش"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "ئۈز"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "تېپىلمىدى"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr ""
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "يۇمشاق دېتالنى يېڭىلاش…"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "ياپ"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "قايتا باغلىنىش"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "ھېساباتنى تەھرىرلەش"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "ياپ"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
-msgstr ""
+msgstr "پۇل كىرگۈزۈش%s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
-msgstr ""
+msgstr "ھېساباتقا پۇل كىرگۈزۈش"
 
 #. top up button
-#: ../src/empathy-main-window.c:1050
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
-msgstr ""
+msgstr "پۇل كىرگۈزۈش…"
 
-#: ../src/empathy-main-window.c:1817
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
-msgstr "ئالاقىلەشكۈچى"
-
-#: ../src/empathy-main-window.c:2169
-msgid "Contact List"
-msgstr "ئالاقەداشلار تىزىملىكى"
+msgstr "ئالاقەداش"
 
-#: ../src/empathy-main-window.c:2287
-msgid "Show and edit accounts"
-msgstr "ھېساباتلارنى كۆرسىتىدۇ ۋە تەھرىرلەيدۇ"
-
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "خەرىتىدىكى ئالاقەداشلار(_M)"
-
-#: ../src/empathy-main-window.ui.h:2
-msgid "Credit Balance"
-msgstr "كېرېدىت قالدۇقى"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Find in Contact _List"
-msgstr "ئالاقەداشلاردىن ئىزدە(_L)"
+#. 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 ""
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Join _Favorites"
-msgstr "يىغقۇچقا قوش(_F)"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "ئالاقەداش تىزىمى"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "Manage Favorites"
-msgstr "يىغقۇچ باشقۇرۇش"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr ""
 
-#: ../src/empathy-main-window.ui.h:6
-msgid "N_ormal Size"
-msgstr "نورمال چوڭلۇق(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "يېڭى سۆھبەت(_N)…"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "New _Call…"
 msgstr "يېڭى چاقىرىش(_C)..."
 
-#: ../src/empathy-main-window.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "باش سۈرەت ۋە نورمال چوڭلۇق"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "ئالاقەداش ئىزدەش(_S)…"
 
-#: ../src/empathy-main-window.ui.h:9
-msgid "P_references"
-msgstr "مايىللىق(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ھۆججەت ئەۋەتىش(_F)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "توردا يوق ئالاقەداشلار(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
 msgid "Show P_rotocols"
 msgstr "كېلىشىملەرنى كۆرسەت(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
-msgid "Sort by _Name"
-msgstr "ئاتى بويىچە تەرتىپلە(_N)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "كرېدىت قالدۇقى"
 
-#: ../src/empathy-main-window.ui.h:12
-msgid "Sort by _Status"
-msgstr "ھالىتى بويىچە تەرتىپلە(_S)"
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "خەرىتىدىكى ئالاقەداشلار(_M)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-roster-window-menubar.ui.h:13
 msgid "_Accounts"
 msgstr "ھېساباتلار(_A)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Blocked Contacts"
 msgstr "چەكلەنگەن ئالاقەداشلار(_B)"
 
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Compact Size"
-msgstr "ئىخچام چوڭلۇق(_C)"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "مايىللىق(_R)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Debug"
-msgstr "سازلا(_D)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ئالاقەداشلاردىن ئىزدە(_L)"
 
-#: ../src/empathy-main-window.ui.h:21
-msgid "_File Transfers"
-msgstr "ھۆججەت ئەۋەتىش(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "ئاتى بويىچە تەرتىپلە(_N)"
 
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Join…"
-msgstr "قاتنىشىش(_J)…"
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "ھالىتى بويىچە تەرتىپلە(_S)"
 
-#: ../src/empathy-main-window.ui.h:24 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "يېڭى سۆھبەت(_N)…"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "باش سۈرەت ۋە نورمال چوڭلۇق"
 
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Offline Contacts"
-msgstr "توردا يوق ئالاقەداشلار(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "نورمال چوڭلۇق(_O)"
 
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Personal Information"
-msgstr "شەخسىي ئۇچۇر(_P)"
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "ئىخچام چوڭلۇق(_C)"
 
-#: ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:23
 msgid "_Room"
 msgstr "ئۆي(_R)"
 
-#: ../src/empathy-main-window.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "ئالاقەداش ئىزدەش(_S)…"
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "قاتنىشىش(_J)…"
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "يىغقۇچقا قوش(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "يىغقۇچ باشقۇرۇش"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "سۆھبەتخانا"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ئەزالار"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
-msgstr ""
-"%s\n"
+msgstr "%s\n"
 "تەكلىپ قىلىش زۆرۈر: %s\n"
 "ئىم زۆرۈر: %s\n"
 "ئەزالار: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "ھەئە"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ياق"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ئۆي تىزىمىنى قۇرۇشنى باشلىغىلى بولمىدى"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ئۆي تىزىمىنى قۇرۇشنى توختاتقىلى بولمىدى"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ئۆي تىزىمىنى ئوقۇغىلى بولمىدى"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ئۆيگە كىرىش"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr ""
-"كىرمەكچى بولغان ئۆينىڭ ئاتىنى بۇ يەرگە كىرگۈزۈڭ ياكى تىزىمدىكى بىر ياكى "
-"بىرنەچچە ئۆينى چېكىڭ."
+msgstr "كىرمەكچى بولغان ئۆينىڭ ئاتىنى بۇ يەرگە كىرگۈزۈڭ ياكى تىزىمدىكى بىر ياكى بىرنەچچە ئۆينى چېكىڭ."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "ئۆي(_R):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr ""
-"ئۆيلەرگە ساھىبخانىلىق قىلىۋاتقان مۇلازىمېتىرنى كىرگۈزۈڭ ياكى ئۆيگە ھازىرقى "
-"مۇلازىمېتىر ساھىبخانىلىق قىلىۋاتقان بولسا بوش قويۇڭ."
+msgstr "ئۆيلەرگە ساھىبخانىلىق قىلىۋاتقان مۇلازىمېتىرنى كىرگۈزۈڭ ياكى ئۆيگە ھازىرقى مۇلازىمېتىر ساھىبخانىلىق قىلىۋاتقان بولسا بوش قويۇڭ."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ئۆيگە كىرىش"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ئۆي تىزىمىنى ئوقۇغىلى بولمىدى"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ئۆي تىزىمى"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "ئۆي(_R):"
-
-#: ../src/empathy-preferences.c:156
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "ئۇچۇر كەلدى"
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "ئۇچۇر يوللاندى"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "يېڭى سۆھبەت"
 
-#: ../src/empathy-preferences.c:159
-msgid "Contact goes online"
-msgstr "ئالاقەداش توردا"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
+msgstr ""
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ئالاقەداش توردا يوق"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "ھېسابات باغلانغان"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "ھېسابات ئۈزۈلگەن"
 
-#: ../src/empathy-preferences.c:459
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "تىل"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:709
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Juliet"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:716
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Romeo"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:722
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
-msgstr ""
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
-msgstr ""
+msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:728
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
-msgstr ""
+msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
-msgstr ""
+msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
-msgstr ""
+msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
-msgstr ""
+msgstr "Juliet ئۈزۈلدى"
 
-#: ../src/empathy-preferences.c:1131
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "مايىللىق"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "قىياپەت"
+msgid "Show _smileys as images"
+msgstr "چىراي ئىپادىلىرىنى سۈرەت شەكلىدە كۆرسەت(_S)"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "ھەرىكەت"
+msgid "Show contact _list in rooms"
+msgstr "ئۆيدىكى ئالاقەداشلار تىزىمىنى كۆرسەت(_L)"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "سۆھبەت ئۇسلۇبى(_E):"
+msgid "Appearance"
+msgstr "قىياپەت"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئۇقتۇرۇش قىلمىسۇن"
+msgid "Start chats in:"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئاۋاز چىقارمىسۇن(_A)"
+msgid "new ta_bs"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Display incoming events in the notification area"
-msgstr "كەلگەن ھادىسىلەرنى ئۇقتۇرۇش رايونىدا كۆرسەت"
+msgid "new _windows"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "ئالاقەداش كىرگەندە ئۇقتۇرۇش قىلسۇن"
+msgid "Display incoming events in the notification area"
+msgstr "كەلگەن ھادىسىلەرنى ئۇقتۇرۇش رايونىدا كۆرسەت"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "ئالاقەداش ئايرىلغاندا ئۇقتۇرۇش قىلسۇن"
+msgid "_Automatically connect on startup"
+msgstr "قوزغالغاندا ئاپتوماتىك باغلان(_A)"
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "سۆھبەت فوكۇسلانمىغاندىمۇ ئۇقتۇرۇش قىلسۇن(_C)"
+msgid "Log conversations"
+msgstr "سۆھبەتنى خاتىرىلەش"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "بۇ تىلغا نىسبەتەن ئىملا تەكشۈرۈشنى قوزغات:"
+msgid "Behavior"
+msgstr "ھەرىكەت"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "ئادەتتىكى"
 
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "سەكرىمە ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
+
 #: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "ئورۇن مەنبەلىرى:"
+msgid "Disable notifications when _away or busy"
+msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئۇقتۇرۇش قىلمىسۇن"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "Log conversations"
-msgstr "سۆھبەتنى خاتىرىلەش"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "سۆھبەت فوكۇسلانمىغاندىمۇ ئۇقتۇرۇش قىلسۇن(_C)"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Notifications"
-msgstr "ئۇقتۇرۇشلار"
+msgid "Enable notifications when a contact comes online"
+msgstr "ئالاقەداش كىرگەندە ئۇقتۇرۇش قىلسۇن"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Play sound for events"
-msgstr "ھادىسە يۈز بەرگەندە ئاۋاز قوي"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ئالاقەداش ئايرىلغاندا ئۇقتۇرۇش قىلسۇن"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "شەخسىي سىر"
+msgid "Notifications"
+msgstr "ئۇقتۇرۇشلار"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"ئورۇننىڭ توغرىلىقنى تۆۋەنلىتىش دېگەنلىك، شەھەر، ئۆلكە ۋە دۆلەتنىڭ ئورۇن "
-"ئۇچۇرلىرىنىڭ توغرىلىقىنى تۆۋەنلىتىش دېگەنلىكتۇر. GPS كوئوردېناتلىرى ئونلۇق "
-"كەسىر چېكىتىنىڭ بىرلەر خانىسىگىچە توغرىدۇر."
+msgid "_Enable sound notifications"
+msgstr "ئاۋازلىق ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "چىراي ئىپادىلىرىنى سۈرەت شەكلىدە كۆرسەت(_S)"
+msgid "Disable sounds when _away or busy"
+msgstr "ئايرىلغاندا ياكى ئالدىراش ۋاقتىدا ئاۋاز چىقارمىسۇن(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "ئۆيدىكى ئالاقەداشلار تىزىمىنى كۆرسەت(_L)"
+msgid "Play sound for events"
+msgstr "ھادىسە يۈز بەرگەندە ئاۋاز قوي"
 
 #: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "ئۈن"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "ئىملا تەكشۈرۈش"
+msgid "Use _echo cancellation to improve call quality"
+msgstr ""
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "تىل تىزىمى سىز ئورناتقان لۇغەتنىڭ تىزىمىنى ئەكس ئەتتۈرۈپ بېرىدۇ."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Themes"
-msgstr "باش تېما"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Variant:"
-msgstr "شالغۇت:"
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr "ئەكس سادانى ئاجىزلىتىش ئىقتىدارى ئىشلىتىلسە، ئاۋازىڭىز باشقىلارغا سۈزۈك ئاڭلىنىدۇ. بىراق بىر قىسىم كومپيۇتېرلاردا بەزى مەسىلىلەرمۇ كېلىپ چىقىدۇ. ئەگەر سۆزلىشىش جەريانىدا غەلىتە ئاۋازلارنى ۋە باشقا نورمالسىزلىق بايقالسا، ئەكس سادانى ئاجىزلىتىش ئىقتىدارىنى ئىناۋەتسىز قىلىپ، سۆزلىشىشنى قايتا باشلاپ كۆرسە بولىدۇ."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "_Automatically connect on startup"
-msgstr "قوزغالغاندا ئاپتوماتىك باغلان(_A)"
+msgid "_Publish location to my contacts"
+msgstr "ئالاقەداشلىرىمغا ئورۇننى ئېلان ئاشكارا قىل(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "_Cellphone"
-msgstr "يانفون(_C)"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "_Enable bubble notifications"
-msgstr "سەكرىمە ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr "ئورۇننىڭ توغرىلىقنى تۆۋەنلىتىش دېگەنلىك، شەھەر، ئۆلكە ۋە دۆلەتنىڭ ئورۇن ئۇچۇرلىرىنىڭ توغرىلىقىنى تۆۋەنلىتىش دېگەنلىكتۇر. GPS كوئوردېناتلىرى ئونلۇق كەسىر چېكىتىنىڭ بىرلەر خانىسىگىچە توغرىدۇر."
 
+#. 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 "_Enable sound notifications"
-msgstr "ئاۋازلىق ئۇقتۇرۇشنى ئىناۋەتلىك قىل(_E)"
+msgid "_Reduce location accuracy"
+msgstr "ئورۇننىڭ توغرىلىقىنى تۆۋەنلەت(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "شەخسىي سىر"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "يانفون(_C)"
+
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Network (IP, Wi-Fi)"
 msgstr "تور(IP، Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Open new chats in separate windows"
-msgstr "يېڭى سۆھبەتنى باشقا كۆزنەكتە باشلا(_O)"
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "ئورۇن مەنبەلىرى:"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Publish location to my contacts"
-msgstr "ئالاقەداشلىرىمغا ئورۇننى ئېلان ئاشكارا قىل(_P)"
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "تىل تىزىمى سىز ئورناتقان لۇغەتنىڭ تىزىمىنى ئەكس ئەتتۈرۈپ بېرىدۇ."
 
-#. 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:35
-msgid "_Reduce location accuracy"
-msgstr "ئورۇننىڭ توغرىلىقىنى تۆۋەنلەت(_R)"
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "بۇ تىلغا نىسبەتەن ئىملا تەكشۈرۈشنى قوزغات:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "ئىملا تەكشۈرۈش"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "سۆھبەت ئۇسلۇبى(_E):"
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "شالغۇت:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "باش تېما"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "ھالىتى"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "چېكىن(_Q)"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "باغلىنىش خەرىتە كۆرۈنۈشى"
 
-#: ../src/empathy-debug-window.c:1218
+#: ../src/empathy-debug-window.c:1598
 msgid "Save"
 msgstr "ساقلا"
 
-#: ../src/empathy-debug-window.c:1394
+#: ../src/empathy-debug-window.c:1658
+msgid "Pastebin link"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin response"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1671
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1674
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1903
 msgid "Debug Window"
 msgstr "سازلاش كۆزنىكى"
 
-#: ../src/empathy-debug-window.c:1476
+#: ../src/empathy-debug-window.c:1961
+msgid "Send to pastebin"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:2000
 msgid "Pause"
 msgstr "ۋاقىتلىق توختا"
 
-#: ../src/empathy-debug-window.c:1488
+#: ../src/empathy-debug-window.c:2012
 msgid "Level "
 msgstr "دەرىجە "
 
-#: ../src/empathy-debug-window.c:1508
+#: ../src/empathy-debug-window.c:2031
 msgid "Debug"
 msgstr "سازلا"
 
-#: ../src/empathy-debug-window.c:1514
+#: ../src/empathy-debug-window.c:2036
 msgid "Info"
-msgstr "ئۇچۇر"
+msgstr "ئۇچۇرى"
 
-#: ../src/empathy-debug-window.c:1520 ../src/empathy-debug-window.c:1569
+#: ../src/empathy-debug-window.c:2041 ../src/empathy-debug-window.c:2087
 msgid "Message"
-msgstr "ئۇچۇر"
+msgstr "ئۇچۇرلار"
 
-#: ../src/empathy-debug-window.c:1526
+#: ../src/empathy-debug-window.c:2046
 msgid "Warning"
 msgstr "ئاگاھلاندۇرۇش"
 
-#: ../src/empathy-debug-window.c:1532
+#: ../src/empathy-debug-window.c:2051
 msgid "Critical"
 msgstr "ئاچقۇچلۇق"
 
-#: ../src/empathy-debug-window.c:1538
+#: ../src/empathy-debug-window.c:2056
 msgid "Error"
 msgstr "خاتالىق"
 
-#: ../src/empathy-debug-window.c:1557
+#: ../src/empathy-debug-window.c:2075
 msgid "Time"
 msgstr "ۋاقىت"
 
-#: ../src/empathy-debug-window.c:1560
+#: ../src/empathy-debug-window.c:2078
 msgid "Domain"
 msgstr "دائىرە"
 
-#: ../src/empathy-debug-window.c:1562
+#: ../src/empathy-debug-window.c:2080
 msgid "Category"
 msgstr "كاتېگورىيە"
 
-#: ../src/empathy-debug-window.c:1564
+#: ../src/empathy-debug-window.c:2082
 msgid "Level"
 msgstr "دەرىجە"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2105
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
-msgstr ""
-"تاللانغان باغلىنىش باشقۇرغۇچى يىراقتىكى سازلاش كېڭەيتىلمىسىنى قوللىمايدۇ"
+msgstr "تاللانغان باغلىنىش باشقۇرغۇچى يىراقتىكى سازلاش كېڭەيتىلمىسىنى قوللىمايدۇ"
 
-#: ../src/empathy-invite-participant-dialog.c:429
-#: ../src/empathy-invite-participant-dialog.c:477
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "قاتناشقۇچىلارنى تەكلىپ قىلىش"
 
-#: ../src/empathy-invite-participant-dialog.c:430
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "سۆھبەتكە تەكلىپ قىلىدىغان ئالاقەداشنى تاللاڭ:"
 
-#: ../src/empathy-invite-participant-dialog.c:473
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "تەكلىپ"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr ""
-"ھېچقانداق سۆزلەشكۈ كۆرسەتمەي، مەشغۇلات(ئىمپورت قىلىش ...قاتارلىق)لارنى "
-"داۋاملاشتۇرۇپ ئاخىرلاشتۇرسۇن"
+msgstr "ھېچقانداق سۆزلەشكۈ كۆرسەتمەي، مەشغۇلات(ئىمپورت قىلىش ...قاتارلىق)لارنى داۋاملاشتۇرۇپ ئاخىرلاشتۇرسۇن"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "«قوشنىلار» ھېساباتى بولمىغاندىلا ھېچقانداق سۆزلەشكۈ كۆرسەتمىسۇن"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr ""
-"ئەڭ دەسلەپتە بېرىلگەن ھېساباتنى تاللاڭ(مەسىلەن، gabble/jabber/"
-"foo_40example_2eorg0)"
+msgstr "ئەڭ دەسلەپتە بېرىلگەن ھېساباتنى تاللاڭ(مەسىلەن، gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<ھېسابات كىملىكى>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy ھېساباتلىرى"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy ھېساباتلىرى"
 
-#: ../src/empathy-debugger.c:66
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "بىرەر مۇلازىمەتنى كۆرسىتىدۇ"
+
+#: ../src/empathy-debugger.c:74
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- Empathy سازلىغۇچى"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy سازلىغۇچ"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy سۆھبەت خېرىدارى"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:187
 msgid "Respond"
 msgstr "ئىنكاس"
 
-#: ../src/empathy-notifications-approver.c:217
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "رەت قىل"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:206
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "جاۋاب"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:206
 msgid "Answer with video"
-msgstr " سىنلىق جاۋاب"
+msgstr "سىنلىق جاۋاب"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:224
 msgid "Decline"
 msgstr "قوشۇلما"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:218
+#: ../src/empathy-notifications-approver.c:229
 msgid "Accept"
 msgstr "قوشۇل"
 
-#: ../src/empathy-notifications-approver.c:260
+#. 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:239
 msgid "Provide"
 msgstr "تەمىنلە"
 
-#: ../src/empathy-call-observer.c:133
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s سىزنى چاقىرغان ئىدى، بىراق سىز باشقىلار بىلەن سۆزلىشىۋاتقان."
 
-#: ../src/empathy-call-window.c:1246
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
+msgid "i"
+msgstr "i"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1889
 #, c-format
-msgid "Call with %d participants"
-msgstr "%d كىشى بىلەن سۆزلەش"
+msgid "Call with %s"
+msgstr "%s بىلەن سۆزلىشىش"
+
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "كومپيۇتېردا ئۇچرىغان IP ئادرېسى"
+
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "ئىنتېرنېتتىكى مۇلازىمېتىردا ئۇچرىغان IP ئادرېسى"
+
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "قارشى تەرەپتە ئۇچرىغان تەڭتۇش(peer)  IP ئادرېسى"
+
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "ئۇلاپ تارقىتىش مۇلازىمېتىرىنىڭ IP ئادرېسى"
+
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "كۆپ ئادرېسلىق خەۋەرلىشىش گۇرۇپپىسىنىڭ IP ئادرېسى"
+
+#: ../src/empathy-call-window.c:2886
+msgid "On hold"
+msgstr "كۈتۈپ تۇر"
+
+#: ../src/empathy-call-window.c:2889
+msgid "Mute"
+msgstr "ئۈنسىز"
+
+#: ../src/empathy-call-window.c:2891
+#| msgid "Location"
+msgid "Duration"
+msgstr "ۋاقتى"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2124
+#: ../src/empathy-call-window.c:2894
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2125
-msgid "On hold"
-msgstr "كۈتۈپ تۇر"
+#: ../src/empathy-call-window.c:2990
+msgid "Technical Details"
+msgstr "تېخنىكىلىق تەپسىلات"
+
+#: ../src/empathy-call-window.c:3029
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s's يۇمشاق دېتالى كومپيۇتېرىڭىزدا بار بولغان ھېچقانداق ئۈن فورماتىنى تونۇمىدى."
+
+#: ../src/empathy-call-window.c:3034
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s's يۇمشاق دېتالى كومپيۇتېرىڭىزدا بار بولغان ھېچقانداق سىن فورماتىنى تونۇمىدى."
+
+#: ../src/empathy-call-window.c:3040
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr "%s نىڭ بىلەن باغلىنىش قۇرالمىدى. سىزنىڭ ياكى قارىشى تەرەپنىڭ بىۋاسىتە باغلىنىشقا رۇخسەت قىلىنمىغان بولۇشى مۇمكىن."
+
+#: ../src/empathy-call-window.c:3046
+msgid "There was a failure on the network"
+msgstr "توردا خاتالىق يۈز بەردى"
+
+#: ../src/empathy-call-window.c:3050
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان ئۈن فورماتلىرى كومپيۇتېرغا ئورنىتىلماپتۇ"
+
+#: ../src/empathy-call-window.c:3053
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "بۇ سۆزلىشىشكە زۆرۈر بولغان سىن فورماتلىرى كومپيۇتېرغا ئورنىتىلماپتۇ"
+
+#: ../src/empathy-call-window.c:3065
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr "Telepathy بۆلىكىدە غەلىتىلىك يۈز بەردى. «ياردەم» تىزىملىكىدىكى «سازلاش» كۆزنىكىدە خاتىرىلىگەن ئۇچۇرلار بىلەن قوشۇپ <a href=\"%s\">بۇ كەمتۈكنى مەلۇم قىلىڭ</a>."
+
+#: ../src/empathy-call-window.c:3074
+msgid "There was a failure in the call engine"
+msgstr "چاقىرىش ماتورىدا خاتالىق يۈز بەردى"
+
+#: ../src/empathy-call-window.c:3077
+msgid "The end of the stream was reached"
+msgstr "ئېقىم ئاخىرلاشتى"
+
+#: ../src/empathy-call-window.c:3117
+msgid "Can't establish audio stream"
+msgstr "ئۈن ئېقىمىنى قۇرغىلى بولمىدى"
 
-#: ../libempathy-gtk/empathy-search-bar.c:282
+#: ../src/empathy-call-window.c:3127
+msgid "Can't establish video stream"
+msgstr "سىن ئېقىمىنى قۇرغىلى بولمىدى"
+
+#: ../src/empathy-call-window.c:3164
+#, c-format
+msgid "Your current balance is %s."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3168
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3170
+msgid "Top Up"
+msgstr ""
+
+#: ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy ئۈن/سىن خېرىدار پروگراممىسى"
+
+#: ../src/empathy-call.c:224
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy ئۈن/سىن خېرىدار پروگراممىسى"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "چوڭ كىچىك ھەرپنى پەرقلەندۈر(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "قانداق تىپتىكى ھېساباتىڭىز بار؟"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "قوشنا"
+
+#: ../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 ""
+
+#: ../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 ""
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "butterfly خاتىرىلىرىنى يۆتكىدى."
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "butterfly خاتىرىسىنى يۆتكىدىمۇ يوق."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "سوكېت تىپىنى ئىشلەتكىلى بولمايدۇ"
+
+#~ msgid "The account %s is edited via My Web Accounts."
+#~ msgstr "ھېسابات %s نى تور ھېساباتىم ئارقىلىق تەھرىرلىگىلى بولمىدى."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "ھېسابات %s نى Empathy دە تەھرىرلىگىلى بولمىدى."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "تور ھېساباتىمنى ئاچ"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "ۋاز كەچ(_N)"
+
+#~ msgid "Personal Information"
+#~ msgstr "شەخسىي ئۇچۇرلارنى"
+
+#~ msgid "Ungrouped"
+#~ msgstr "گۇرۇپپىلانمىغان"
+
+#~ msgid "Favorite People"
+#~ msgstr "ئامراق ئادەملەر"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "تەھرىر(_E)"
+
+#~ msgid "Select a contact"
+#~ msgstr "ئالاقەداش تاللايدۇ"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "ئۇلانغان ئالاقەداشلار"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "ئۇلايدىغان ئالاقەداشنى تاللاش"
+
+#~ msgid "New contact preview"
+#~ msgstr "يېڭى ئالاقەداشنى ئالدىن كۆرۈش"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "تىزىمدا تاللانغان ئالاقەداشلار ئوز-ئارا ئۇلىنىدۇ."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "ئالاقەداشلارنى ئۇلاش(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "ئالاقەداشلارنى ئۇلاش"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "ئۈزۈش(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr ""
+#~ "كۆرسىتىلگەن ئۇلانغان ئالاقەداشلارنى ئۇلانمىغان، ئايرىم-ئايرىم ئالاقەداشقا "
+#~ "پارچىلايدۇ."
+
+#~ msgid "_Link"
+#~ msgstr "ئۇلانما(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ئۇلانغان ئالاقەداش «%s» نى ئۈزسۇنمۇ؟"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ئۇلانغان ئالاقەداشلارنى راستلا ئۈزەمسىز؟ بۇنداقتا ئۇلانغان باشقا بارلىق "
+#~ "ئالاقەداشلار ئايرىم-ئايرىم ئالاقەداشقا ئايلىنىپ كېتىدۇ."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "ئۈز(_U)"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ئالاقەداش كىملىكى:"
+
+#~ msgid "C_hat"
+#~ msgstr "سۆھبەت(_H)"
+
+#~ msgid "C_all"
+#~ msgstr "چاقىر(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "سىزنىڭ ھازىرقى ھالىتىڭىزنى بېكىتىدۇ"
+
+#~ msgid "Find Next"
+#~ msgstr "كېيىنكىنى ئىزدە"
+
+#~ msgid "Find Previous"
+#~ msgstr "كېيىنكىنى ئىزدە"
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "ئىختىيارى ئۇچۇر كىرگۈزۈش"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "يېڭى ھالەت ئۇچۇرىنى ساقلا(_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "ساقلانغان ھالەت ئۇچۇرى"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "تاللانغان ئالاقەداش ھۆججەتنى تاپشۇرۇپ ئالالمايدۇ."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "تاللانغان ئالاقەداش توردا يوق."
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "ھېساباتنى ئىمپورت قىلىۋاتقاندا خاتالىق كۆرۈلدى."
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "ھېسابات تەپسىلاتىنى تەھلىل قىلىۋاتقاندا خاتالىق كۆرۈلدى."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "ھېسابات قۇرۇۋاتقاندا خاتالىق كۆرۈلدى."
+
+#~ msgid "There was an error."
+#~ msgstr "خاتالىق كۆرۈلدى."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "خاتالىق ئۇچۇرى: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "سىز كەينىگە قايتىپ ھېسابات قايتا تەپسىلاتىنى كىرگۈزسىڭىز ياكى بۇ "
+#~ "ياردەمچىنى ئاخىرلاشتۇرۇپ، كېيىن «تەھرىر» تىزىملىكى ئارقىلىق ھېسابات "
+#~ "قوشسىڭىز بولىدۇ."
+
+#~ msgid "An error occurred"
+#~ msgstr "خاتالىق كۆرۈلدى"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "يەنە باشقا تەڭشىمەكچى بولغان سۆھبەت ھېساباتىڭىز بارمۇ؟"
+
+#~ msgid "Enter your account details"
+#~ msgstr "ھېساباتىڭىزنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "قانداق تىپتىكى ھېسابات قۇرغۇڭىز بار؟"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "باشقا مۇڭداشقۇ ھېساباتى قۇرغۇڭىز بارمۇ؟"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "يېڭى ھېساباتنىڭ تەپسىلاتىنى كىرگۈزۈڭ"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Empathy ئىشلىتىپ سىز توردىكى قوشنىلىرىڭىز ۋە Google سۆھبەت، AIM، Windows "
+#~ "Live ۋە باشقا سۆھبەت پروگراممىلىرىنى ئىشلىتىدىغان دوست، ساۋاقداشلىرىڭىز "
+#~ "بىلەن مۇڭدىشالايسىز. مىكروفون ۋە تور كامېراسى بولسا ئاۋازلىق ۋە سىنلىق "
+#~ "مۇڭداشقىلىمۇ بولىدۇ."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "باشقا مۇڭداشقۇلاردا ئىشلەتكەن ھېساباتىڭىز بارمۇ؟"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "ھەئە، ھېساباتىمنىڭ تەپسىلاتىنى ئىمپورت قىلىمەن "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "ھەئە، ھېساباتىمغا ئائىت تەپسىلاتلارنى كىرگۈزىمەن"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "ياق، يېڭى ھېسابات قۇرغۇم بار"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "ياق، مېنىڭ يېقىندىكى كىشىلەرنى ھازىرلا كۆرگۈم بار"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "ئىمپورت قىلماقچى بولغان ھېساباتلارنى تاللاڭ:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "ياق، ھازىرچە مۇشۇلارلا"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "تەھرىر->ھېساباتلار"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "بۇ ئىقتىدارنى ھازىرلا ئىناۋەتلىك قىلغۇم يوق(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "ئەگەر telepathy-salut ئورنىتىلمىغان بولسا سىز يەرلىك توردىكى باشقىلار "
+#~ "بىلەن سۆھبەتلىشەلمەيسىز. بۇ ئىقتىدارنى ئىشلەتمەكچى بولسىڭىز telepathy-"
+#~ "salut بوغچىسىنى ئورنىتىڭ ۋە «ھېسابات» سۆزلەشكۈسىنى ئىشلىتىپ بىر دانە "
+#~ "«قوشنىلار» ھېساباتىدىن بىرنى قۇرۇڭ."
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "ئۇچۇر ۋە VoIP ھېساباتلىرى ياردەمچىسى"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Empathy غا مەرھابا"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "ئۆزىڭىزنىڭ ھېساباتلىرىنى ئىمپورت قىلىدۇ"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "تەپسىلاتىنى كىرگۈزۈڭ"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "يېڭى ھېسابات قۇرماقچى بولۇۋاتىسىز، بۇنىڭدا \n"
+#~ "ئۆزگىرىشلەر يوق بولۇپ كېتىدۇ. داۋاملاشتۇرۇۋەرسۇنمۇ؟"
+
+#~ msgid "Protocol:"
+#~ msgstr "كېلىشىم:"
+
+#~ msgid "Contrast"
+#~ msgstr "ئاق-قارىلىقى"
+
+#~ msgid "Brightness"
+#~ msgstr "يورۇقلۇق"
+
+#~ msgid "Gamma"
+#~ msgstr "گامما"
+
+#~ msgid "Volume"
+#~ msgstr "دىسكا"
+
+#~ msgid "_Sidebar"
+#~ msgstr "يان بالداق(_S)"
+
+#~ msgid "Audio input"
+#~ msgstr "ئۈن كىرگۈزۈش"
+
+#~ msgid "Video input"
+#~ msgstr "سىن كىرگۈزۈش"
+
+#~ msgid "Details"
+#~ msgstr "تەپسىلاتى"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "نامەلۇم"
+
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "باغلاندى — %d:%02dm"
+
+#~ msgid "Call the contact again"
+#~ msgstr "ئالاقەداشنى قايتا چاقىرىش"
+
+#~ msgid "Camera Off"
+#~ msgstr "كامېرا ئېتىك"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "كامېرانى ئىناۋەتسىز قىلىپ سىن يوللاشنى توختىتىدۇ"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "كامېرانى قوزغىتىپ سىن يوللا"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "كامېرانى قوزغات بىراق سىننى يوللىما"
+
+#~ msgid "Preview"
+#~ msgstr "ئالدىن كۆزەت"
+
+#~ msgid "Redial"
+#~ msgstr "قايتا چاقىرىش"
+
+#~ msgid "V_ideo"
+#~ msgstr "سىن(_I)"
+
+#~ msgid "Video Off"
+#~ msgstr "سىن ئېتىك"
+
+#~ msgid "Video On"
+#~ msgstr "سىن ئوچۇق"
+
+#~ msgid "Video Preview"
+#~ msgstr "سىننى ئالدىن كۆزىتىش"
+
+#~ msgid "_Dialpad"
+#~ msgstr "نومۇر تاختىسى(_D)"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "ھېساباتلارنى كۆرسىتىدۇ ۋە تەھرىرلەيدۇ"
+
+#~ msgid "_Personal Information"
+#~ msgstr "شەخسىي ئۇچۇر(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "يېڭى سۆھبەتنى باشقا كۆزنەكتە باشلا(_O)"
+
+#~ msgid "Call with %d participants"
+#~ msgstr "%d كىشى بىلەن سۆزلەش"
+
 #~ msgid "All"
 #~ msgstr "ھەممىسى"
 
diff --git a/po/uk.po b/po/uk.po
index b16c3ce39..c50c9216e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,13 +4,13 @@
 # Sergiy Dolgopolov <virgo@gnome.org.ua>, 2004.
 # Maxim Dziumanenko <dziumanenko@gmail.com>, 2008
 # Sergey Panasenko <nitay@users.sourceforge.net>, 2009.
-# Korostil Daniel <ted.korostiled@gmail.com>, 2011.
+# Korostil Daniel <ted.korostiled@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: Empathy\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-11 16:53+0200\n"
-"PO-Revision-Date: 2011-12-11 20:56+0300\n"
+"POT-Creation-Date: 2012-03-08 14:27+0200\n"
+"PO-Revision-Date: 2012-03-08 21:37+0300\n"
 "Last-Translator: Korostil Daniel <ted.korostiled@gmail.com>\n"
 "Language-Team: translation@linux.org.ua\n"
 "Language: uk\n"
@@ -19,447 +19,463 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.6.1\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "Балачки через Google Talk, Facebook, MSN та багато інших служб "
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Миттєві повідомлення"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Обмін повідомленнями Empathy"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Миттєві повідомлення"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "Балачки через Google Talk, Facebook, MSN та багато інших служб "
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "Листування й облікові записи VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "Керування обліковими записами повідомлень та VoIP"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Завжди відкривати нову бесіду у новому вікні."
+msgid "Connection managers should be used"
+msgstr "Не слід використовувати менеджери з'єднань"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "Пристрій камери"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Чи використовувати менеджер з'єднань для автоматичного встановлення/"
+"розривання зв'язку."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "Положення камери"
+msgid "Empathy should auto-connect on startup"
+msgstr "З'єднуватися під час запуску"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr ""
-"Символ для додавання після псевдоніму, якщо у бесіді використовується "
-"автоматичне доповнення псевдонімів клавішею Tab."
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Автоматично з'єднувати облікові записи при запуску."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "Тема вікна бесіди"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy слід автоматично переходити в режим очікування"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "Варіант теми вікна бесіди"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Чи слід іти в режим очікування, коли користувач бездіяльний."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Список мов, що використовуються при перевірянні орфографії, розділених "
-"комами (наприклад, «en, ru, uk»)."
+msgid "Empathy default download folder"
+msgstr "Типова тека для звантаження файлів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "Щільний список контактів"
+msgid "The default folder to save file transfers in."
+msgstr "Типова тека для збереження вхідних файлів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "Не слід використовувати менеджери з'єднань"
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr ""
+"Магічне число для перевіряння, коли варто запустити завдання зі зваженого "
+"очищення"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "Критерій упорядкування списку контактів"
+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."
+msgstr ""
+"empathy-sanity-cleaning.c використовує це число для перевіряння, чи варто "
+"виконувати завдання з очищення, чи ні. Користувачам не слід змінювати цей "
+"ключ вручну."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
-"Контур об'єкта D-Bus останнього облікового запису, який вибрано для "
-"приєднання до кімнати."
+msgid "Show offline contacts"
+msgstr "Показувати відсутні контакти"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "Типовий пристрій камери для відеовикликів, наприклад, /dev/video0."
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Чи показувати недоступних у мережі користувачів у списку контактів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "Каталог, що використовується для вибору зображень аватарів"
+msgid "Show avatars"
+msgstr "Показувати аватари"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "Вимкнути контекстні сповіщення у стані «відійшов»"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "Чи показувати аватари для контактів у списку та вікні балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "Вимкнути звуки у стані «відійшов»"
+msgid "Show protocols"
+msgstr "Показати протокол:"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "Показувати вхідні події в ділянці стану"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "Чи показувати аватари для контактів у списку та вікні балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Показувати вхідні події в ділянці стану. Якщо ні, то представити їх "
-"користувачу негайно."
+msgid "Show Balance in contact list"
+msgstr "Показувати залишок у списку контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "Підтримування усунення відлуння"
+msgid "Whether to show account balances in the contact list."
+msgstr "Чи показувати залишок облікових записів у списку контактів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy може публікувати місцевість користувачів"
+msgid "Compact contact list"
+msgstr "Щільний список контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy може використовувати GPS для визначення місцевості."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Чи показувати список контактів стисненим."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr ""
-"Empathy може використовувати стільникову мережу для визначення  місцевості"
+msgid "Hide main window"
+msgstr "Сховати головне вікно"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy може використовувати  мережу для припущень щодо місцевості"
+msgid "Hide the main window."
+msgstr "Сховати головне вікно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Типова тека для звантаження файлів"
+msgid "Default directory to select an avatar image from"
+msgstr "Каталог, що використовується для вибору зображень аватарів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy слід автоматично переходити в режим очікування"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Останній каталог, з якого брались зображення аватарів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "З'єднуватися під час запуску"
+msgid "Open new chats in separate windows"
+msgstr "Відкривати нові бесіди у новому вікні"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Empathy має послабити точність визначення місцевості"
+msgid "Always open a separate chat window for new chats."
+msgstr "Завжди відкривати нову бесіду у новому вікні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Empathy має використовувати аватар контакту, як піктограму вікна із бесідою"
+msgid "Display incoming events in the status area"
+msgstr "Показувати вхідні події в ділянці стану"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "Увімкнути засіб розроблення WebKit"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Показувати вхідні події в ділянці стану. Якщо ні, то представити їх "
+"користувачу негайно."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "Ввімкнути контекстні сповіщення для нових повідомлень"
+msgid "The position for the chat window side pane"
+msgstr "Позиція бокової панелі вікна балачки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "Увімкнути перевіряння орфографії"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "Збережена позиція (в пікселях) бокової панелі вікна балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "Сховати головне вікно"
+msgid "Show contact groups"
+msgstr "Показати групу контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "Сховати головне вікно."
+msgid "Whether to show groups in the contact list."
+msgstr "Чи показувати групи у списку контактів."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "Останній обліковий запис, вибраний у вікні приєднання до кімнати"
+msgid "Contact list sort criterion"
+msgstr "Критерій упорядкування списку контактів"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "Символ автоматичне доповнення псевдоніму"
+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 ""
+"Критерій для впорядковування списку контактів. Типово впорядковується за "
+"станом контакту зі значення «state». Значення «name» впорядкує список "
+"контактів за їхньою назвою."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "Відкривати нові бесіди у новому вікні"
+msgid "Use notification sounds"
+msgstr "Використовувати звуки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Шлях до теми Adium"
+msgid "Whether to play a sound to notify of events."
+msgstr "Чи відтворювати звукові сигнали при подіях."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "Шлях до теми Adium для використання у балачці Adium."
+msgid "Disable sounds when away"
+msgstr "Вимкнути звуки у стані «відійшов»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound for incoming messages"
-msgstr "Відтворити звук при отриманні повідомлення"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Чи відтворювати звукові сигнали у станах «відійшов» або «зайнятий»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "Відтворити звук для нової розмови"
+msgid "Play a sound for incoming messages"
+msgstr "Відтворити звук при отриманні повідомлення"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Play a sound for outgoing messages"
-msgstr "Відтворити звук при відправленні повідомлення"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Чи відтворювати звуковий сигнал при надходженні повідомлення."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "Відтворити звук при появі контакту в мережі"
+msgid "Play a sound for outgoing messages"
+msgstr "Відтворити звук при відправленні повідомлення"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "Відтворити звук при від'єднанні контакту"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Чи відтворювати звуковий сигнал при надсиланні повідомлення."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "Відтворити звук при вході"
+msgid "Play a sound for new conversations"
+msgstr "Відтворити звук для нової розмови"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "Відтворити звук при виході"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Чи відтворювати звуковий сигнал для нової бесіди."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Контекстні сповіщення, коли балачка не в фокусі"
+msgid "Play a sound when a contact logs in"
+msgstr "Відтворити звук при появі контакту в мережі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "Контекстні сповіщення, коли контакт увійде"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Чи відтворювати звуковий сигнал при вході контакту в мережу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "Контекстні сповіщення, коли контакт вийде"
+msgid "Play a sound when a contact logs out"
+msgstr "Відтворити звук при від'єднанні контакту"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "Перегляд положення потрібно здійснювати протягом дзвінка."
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Чи відтворювати звуковий сигнал при виході контакту з мережі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "Показувати залишок у списку контактів"
+msgid "Play a sound when we log in"
+msgstr "Відтворити звук при вході"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "Показувати аватари"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Чи відтворювати звуковий сигнал при вході у мережу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "Показати список контактів у кімнаті"
+msgid "Play a sound when we log out"
+msgstr "Відтворити звук при виході"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "Показувати підтвердження про закриття головного вікна"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Чи відтворювати звуковий сигнал при виході з мережі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "Показувати відсутні контакти"
+msgid "Enable popup notifications for new messages"
+msgstr "Ввімкнути контекстні сповіщення для нових повідомлень"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "Показати протокол:"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr ""
+"Чи показувати контекстні сповіщення при надходженні нового повідомлення."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "Перевіряння правопису для мов"
+msgid "Disable popup notifications when away"
+msgstr "Вимкнути контекстні сповіщення у стані «відійшов»"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "Типова тека для збереження вхідних файлів."
+msgid "Whether to show popup notifications when away or busy."
+msgstr ""
+"Чи показувати контекстні сповіщення у станах «відійшов» або «зайнятий»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Останній каталог, з якого брались зображення аватарів."
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Контекстні сповіщення, коли балачка не в фокусі"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "Позиція бокової панелі вікна балачки"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Чи показувати контекстні сповіщення при надходженні нового повідомлення, "
+"коли балачку вже відкрито, але він не в фокусі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "Збережена позиція (в пікселях) бокової панелі вікна балачки."
+msgid "Pop up notifications when a contact logs in"
+msgstr "Контекстні сповіщення, коли контакт увійде"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Ця тема використовується для вікна бесіди."
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "Чи показувати контекстні сповіщення коли контакт входить у мережу."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Варіант теми, який використовується для показу розмов у вікні балачки."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Контекстні сповіщення, коли контакт вийде"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Use graphical smileys"
-msgstr "Використовувати графічні емоційки"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "Чи показувати контекстні сповіщення коли контакт виходить з мережі."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "Використовувати звуки"
+msgid "Use graphical smileys"
+msgstr "Використовувати графічні емоційки"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "Використовувати тему для бесід"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Перетворювати текстові емоційки у графічні."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Чи показувати місцевості вашим контактам."
+msgid "Show contact list in rooms"
+msgstr "Показати список контактів у кімнаті"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Чи використовувати GPS для визначення місцевості."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Чи показувати список контактів у кімнаті."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Чи використовувати мобільну мережу для визначення місцевості."
+msgid "Chat window theme"
+msgstr "Тема вікна бесіди"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Чи використовувати комп'ютерну мережу для визначення місцевості."
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Ця тема використовується для вікна бесіди."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Автоматично з'єднувати облікові записи при запуску."
+msgid "Chat window theme variant"
+msgstr "Варіант теми вікна бесіди"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Чи слід іти в режим очікування, коли користувач бездіяльний."
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Варіант теми, який використовується для показу розмов у вікні балачки."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Чи слід зменшити точність визначення місцевості задля конфіденційності."
+msgid "Path of the Adium theme to use"
+msgstr "Шлях до теми Adium"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "Чи використовувати аватари контактів як піктограми вікон із бесідами"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "Шлях до теми Adium для використання у балачці Adium."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "Чи вмикати такі засоби розроблення WebKit, як Web Inspector."
+msgid "Enable WebKit Developer Tools"
+msgstr "Увімкнути засіб розроблення WebKit"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Чи використовувати менеджер з'єднань для автоматичного встановлення/"
-"розривання зв'язку."
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "Чи вмикати такі засоби розроблення WebKit, як Web Inspector."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "Перевіряти набрані слова за списком мов для перевіряння орфографії."
+msgid "Inform other users when you are typing to them"
+msgstr "Повідомляти інших користувачів, коли ви друкуєте їм"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Перетворювати текстові емоційки у графічні."
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"Чи надсилати зміни станів «складання» або «зупинення». Наразі не впливає на "
+"стан «відсутній»."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Чи ввімкнути фільтр усунення відлуння Pulseaudio."
+msgid "Use theme for chat rooms"
+msgstr "Використовувати тему для бесід"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Чи відтворювати звуковий сигнал при вході контакту в мережу."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Чи використовувати теми для вікон бесід."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Чи відтворювати звуковий сигнал при виході контакту з мережі."
+msgid "Spell checking languages"
+msgstr "Перевіряння правопису для мов"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "Чи відтворювати звукові сигнали при подіях."
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr ""
+"Список мов, що використовуються при перевірянні орфографії, розділених "
+"комами (наприклад, «en, ru, uk»)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Чи відтворювати звуковий сигнал при надходженні повідомлення."
+msgid "Enable spell checker"
+msgstr "Увімкнути перевіряння орфографії"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Чи відтворювати звуковий сигнал для нової бесіди."
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "Перевіряти набрані слова за списком мов для перевіряння орфографії."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Чи відтворювати звуковий сигнал при надсиланні повідомлення."
+msgid "Nick completed character"
+msgstr "Символ автоматичне доповнення псевдоніму"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "Чи відтворювати звуковий сигнал при вході у мережу."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Символ для додавання після псевдоніму, якщо у бесіді використовується "
+"автоматичне доповнення псевдонімів клавішею Tab."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Чи відтворювати звуковий сигнал при виході з мережі."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Empathy має використовувати аватар контакту, як піктограму вікна із бесідою"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Чи відтворювати звукові сигнали у станах «відійшов» або «зайнятий»."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Чи використовувати аватари контактів як піктограми вікон із бесідами"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "Чи показувати контекстні сповіщення коли контакт виходить з мережі."
+msgid "Last account selected in Join Room dialog"
+msgstr "Останній обліковий запис, вибраний у вікні приєднання до кімнати"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "Чи показувати контекстні сповіщення коли контакт входить у мережу."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr ""
+"Контур об'єкта D-Bus останнього облікового запису, який вибрано для "
+"приєднання до кімнати."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Чи показувати контекстні сповіщення при надходженні нового повідомлення, "
-"коли балачку вже відкрито, але він не в фокусі."
+msgid "Camera device"
+msgstr "Пристрій камери"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr ""
-"Чи показувати контекстні сповіщення при надходженні нового повідомлення."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "Типовий пристрій камери для відеовикликів, наприклад, /dev/video0."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "Чи показувати залишок облікових записів у списку контактів."
+msgid "Camera position"
+msgstr "Положення камери"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "Чи показувати аватари для контактів у списку та вікні балачки."
+msgid "Position the camera preview should be during a call."
+msgstr "Перегляд положення потрібно здійснювати протягом дзвінка."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Чи показувати недоступних у мережі користувачів у списку контактів."
+msgid "Echo cancellation support"
+msgstr "Підтримування усунення відлуння"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr ""
-"Чи показувати контекстні сповіщення у станах «відійшов» або «зайнятий»."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Чи ввімкнути фільтр усунення відлуння Pulseaudio."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "Чи показувати аватари для контактів у списку та вікні балачки."
+msgid "Show hint about closing the main window"
+msgstr "Показувати підтвердження про закриття головного вікна"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Чи показувати список контактів у кімнаті."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "Чи показувати список контактів стисненим."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
@@ -467,75 +483,94 @@ msgstr ""
 "Чи показувати повідомлення про закриття головного вікна кнопкою «x» у "
 "заголовку."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy може публікувати місцевість користувачів"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Чи показувати місцевості вашим контактам."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "Чи використовувати теми для вікон бесід."
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy може використовувати  мережу для припущень щодо місцевості"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-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 "Whether Empathy can use the network to guess the location."
+msgstr "Чи використовувати комп'ютерну мережу для визначення місцевості."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
 msgstr ""
-"Критерій для впорядковування списку контактів. Типово впорядковується за "
-"псевдонімом контакту — «name». При значенні «state» список буде впорядковано "
-"за станом."
+"Empathy може використовувати стільникову мережу для визначення  місцевості"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "Керування обліковими записами повідомлень та VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Чи використовувати мобільну мережу для визначення місцевості."
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
-msgid "Messaging and VoIP Accounts"
-msgstr "Листування й облікові записи VoIP"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy може використовувати GPS для визначення місцевості."
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Чи використовувати GPS для визначення місцевості."
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Empathy має послабити точність визначення місцевості"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr ""
+"Чи слід зменшити точність визначення місцевості задля конфіденційності."
+
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "Причину не вказано"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "Запит на заміну стану"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "Ви скасували передачу файла "
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "Інший учасник скасував передавання файла"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "Помилка при спробі передати файл"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "Інший учасник не може передати файл"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:919
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Передавання файла завершено, але файл пошкоджено"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1205
 msgid "File transfer not supported by remote contact"
 msgstr "Передача файлів не працює для віддалених контактів"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1261
 msgid "The selected file is not a regular file"
 msgstr "Вибраний файл не є звичайним файлом"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1270
 msgid "The selected file is empty"
 msgstr "Вибраний файл порожній"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "Пропущений виклик від %s"
@@ -551,139 +586,139 @@ msgstr "Викликано %s"
 msgid "Call from %s"
 msgstr "Виклик від %s"
 
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Доступний"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Відійшов"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Невидимий"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Поза мережею"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Причину не вказано"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Встановлено стан «поза мережею»"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "Помилка мережі"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "Не вдалось аутентифікувати"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "Помилка шифрування"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Псевдонім уже використовується"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Сертифікат недоступний"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Сертифікат ненадійний"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Сертифіката застарів"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Сертифікат не активовано"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Сертифікат з помилкою  у назві вузла"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Відбитки сертифікатів не збігаються"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Самопідписаний сертифікат"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "Помилка сертифіката"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Шифрування не доступне"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Сертифікат недійсний"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "У з'єднанні відмовлено"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "З'єднання неможливо встановити"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "З'єднання втрачено"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Цей ресурс уже з'єднано з сервером"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "Цей обліковий запис уже з'єднано з сервером"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "З'єднання замінено на нове з'єднання через той самий ресурс"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Цей обліковий запис уже існує на сервері"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Сервер зараз зайнятий, щоб обробити з'єднання"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Сертифікат анульовано"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Сертифікат використовує небезпечний алгоритм шифрування або криптографічно "
 "ненадійний."
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -691,27 +726,31 @@ msgstr ""
 "Довжина сертифіката сервера або глибина ланцюжка сертифіката сервера "
 "перевищує обмеження криптографічної бібліотеки"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "Ваша програма надто стара"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "Внутрішня помилка"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Люди поблизу"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! Японія"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Балачка Facebook"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -719,7 +758,7 @@ msgstr[0] "%d секунду тому"
 msgstr[1] "%d секунди тому"
 msgstr[2] "%d секунд тому"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -727,7 +766,7 @@ msgstr[0] "%d хвилину тому"
 msgstr[1] "%d хвилини тому"
 msgstr[2] "%d хвилин тому"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -735,7 +774,7 @@ msgstr[0] "%d годину тому"
 msgstr[1] "%d години тому"
 msgstr[2] "%d годин тому"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -743,7 +782,7 @@ msgstr[0] "%d день тому"
 msgstr[1] "%d дні тому"
 msgstr[2] "%d днів тому"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -751,7 +790,7 @@ msgstr[0] "%d тиждень тому"
 msgstr[1] "%d тижня тому"
 msgstr[2] "%d тижнів тому"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -759,224 +798,196 @@ msgstr[0] "%d місяць тому"
 msgstr[1] "%d місяця тому"
 msgstr[2] "%d місяців тому"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "в майбутньому"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Усі облікові записи"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Пароль"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Сервер"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Порт"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../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:1182
-msgid "My Web Accounts"
-msgstr "Мої мережеві облікові записи "
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Обліковий запис %s змінено через %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Обліковий запис %s неможливо редагувати в Empathy."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "Запустити мій обліковий запис із сайту"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "Редагувати %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "Користувач:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Застосувати"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "_Увійти"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Цей обліковий запис вже існує на сервері"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Створити новий обліковий запис на сервері"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "_Скасувати"
-
 #. 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:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s на %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "Обліковий запис %s"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Новий обліковий запис"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Приклад:</b> MyScreenName"
+#: ../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:"
+msgstr "_Пароль:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Додатково"
+msgid "Screen _Name:"
+msgstr "_Екранний псевдонім:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Приклад:</b> MyScreenName"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Пароль:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Запам'ятати пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Запам'ятати пароль"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "П_орт:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "Запам'ятати пароль"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Екранний псевдонім:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Пароль вашого AIM?"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Додатково"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Пароль облікового запису AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "П_орт:"
+msgid "What is your AIM password?"
+msgstr "Пароль вашого AIM?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Сервер:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Приклад:</b> username"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Запам'ятати пароль"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "_Ідентифікатор:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Приклад:</b> username"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Ваш ідентифікатор користувача GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Пароль вашого GroupWise?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Приклад:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "_Набір символів:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Ідентифікатор користувача (UIN) у ICQ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Пароль у ICQ?"
 
@@ -1013,11 +1024,23 @@ msgstr "Параметри"
 msgid "None"
 msgstr "Немає"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "Мережа"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "Мережа:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Кодування:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Сервери"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1025,14 +1048,6 @@ msgstr ""
 "Більшість серверів IRC потребують пароль, отож, якщо ви не впевнені, не "
 "вводьте пароль."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "Мережа"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "Мережа:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Псевдонім:"
@@ -1049,48 +1064,20 @@ msgstr "Повідомлення при виході:"
 msgid "Real name:"
 msgstr "Справжнє ім'я:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Сервери"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Який ваш псевдонім у IRC?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Яка мережа IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>Приклад:</b> user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>Приклад:</b> user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "_Шифрування обов'язкове (TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Ігнорувати помилки сертифікатів SSL"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "Замінювати параметри сервера"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "П_ріоритет:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Який ваш псевдонім у IRC?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "Ре_сурс:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Користувач у Facebook?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1102,180 +1089,204 @@ msgstr ""
 "Використовуйте <a href=\"http://www.facebook.com/username/\">цю сторінку</a> "
 "для вибору користувача Facebook, якщо у вас його немає."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Використовувати старе _шифрування (SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Пароль у Facebook?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Користувач у Facebook?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Ваш ідентифікатор у Google?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>Приклад:</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Пароль у Google"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>Приклад:</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Ігнорувати помилки сертифікатів SSL"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "П_ріоритет:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "Ре_сурс:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "_Шифрування обов'язкове (TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Використовувати старе _шифрування (SSL)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "Замінювати параметри сервера"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Ідентифікатор Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Пароль у Jabber?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Бажаний ідентифікатор у Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Пароль у Jabber?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Бажаний пароль у Jabber?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>Приклад:</b> user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Ідентифікатор у Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "Пароль у Windows Live?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "_Адреса електронної пошти:"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "П_севдонім:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Прізвище:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ім'я: "
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "_Публічне прізвисько:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Прізвище:"
+msgid "E-_mail address:"
+msgstr "_Адреса електронної пошти:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "_Публічне прізвисько:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_Користувач:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>Приклад:</b> user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "Користувач для аутентифікації:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Виявляти з'єднання"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Відкрийте для себе сервер STUN автоматично"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr ""
+"Скористатись цим обліковим записом для _стаціонарних і мобільних телефонів"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Ігнорувати помилки TLS"
+msgid "NAT Traversal Options"
+msgstr "Параметри NAT Traversal"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Інтервал (у секундах)"
+msgid "Proxy Options"
+msgstr "Параметри проксі"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Параметри утримування з'єднання"
+msgid "Miscellaneous Options"
+msgstr "Інші параметри"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Вільне маршрутизування"
+msgid "STUN Server:"
+msgstr "Сервер STUN:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Механізм:"
+msgid "Discover the STUN server automatically"
+msgstr "Відкрийте для себе сервер STUN автоматично"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Інші параметри"
+msgid "Discover Binding"
+msgstr "Виявляти з'єднання"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Параметри NAT Traversal"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Параметри утримування з'єднання"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Порт:"
+msgid "Mechanism:"
+msgstr "Механізм:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Параметри проксі"
+msgid "Interval (seconds)"
+msgstr "Інтервал (у секундах)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "Користувач для аутентифікації:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Транспорт"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "Сервер STUN:"
+msgid "Loose Routing"
+msgstr "Вільне маршрутизування"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "Сервер:"
+msgid "Ignore TLS Errors"
+msgstr "Ігнорувати помилки TLS"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Транспорт"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr ""
-"Скористатись цим обліковим записом для _стаціонарних і мобільних телефонів"
+msgid "Port:"
+msgstr "Порт:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Пароль до облікового запису у SIP?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Ідентифікатор облікового запису у SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_Користувач:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Пароль до облікового запису у SIP?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo! I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Ігнорувати запрошення до бесід у кімнатах та конференцій"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "_Локаль списку бесід:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Ідентифікатор у Yahoo! ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Пароль у Yahoo!?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo! I_D:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "_Локаль списку бесід:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1313,88 +1324,88 @@ msgstr "Усі файли"
 msgid "Click to enlarge"
 msgstr "Натисніть для збільшення"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "Помилка виклику"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "Вказаний контакт не підтримує виклики"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "Вказаний контакт поза мережею"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "Вказаний контакт недійсний"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Екстрені виклики не підтримуються цим протоколом"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "Ви не має достатньо на рахунку, щоб здійснити цей виклик"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
 msgstr "Не вдалось відкрити приватну кімнату"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
 msgstr "Тема не підтримується у цій бесіді"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
 msgstr "У вас немає прав змінювати тему"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:992
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "«%s» — недійсний ідентифікатор контакту"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1087
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: очистити всі повідомлення з поточної бесіди"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1090
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: встановити тему поточної бесіди"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1093
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: приєднатися до нової кімнати розмов"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1096
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: приєднатися до нової кімнати розмов"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1100
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<chat room ID>] [<reason>]: покинути кімнату бесіди, типово теперішню"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1104
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: відкрити приватну бесіду"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1107
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: відкрити приватну бесіду"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1110
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: змінити назву на поточному сервері"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1113
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: надіслати повідомлення ACTION до поточної бесіди"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1116
 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 "
@@ -1404,11 +1415,11 @@ msgstr ""
 "для надсилання нового повідомлення, що починається з '/'. Наприклад: \"/"
 "скажіть /join для приєднання до нової кімнати розмов\""
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1121
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: показує інформацію про контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1416,121 +1427,127 @@ msgstr ""
 "/help [<command>]: показати довідку. Якщо визначено <command>, показати "
 "синтаксис команди."
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1143
 #, c-format
 msgid "Usage: %s"
 msgstr "Використання: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
 msgstr "Невідома команда"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1314
 msgid "Unknown command; see /help for the available commands"
 msgstr "Невідома команда; для виводу списку доступних команд введіть /help"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1565
 msgid "insufficient balance to send message"
 msgstr "недостатній залишок для надсилання повідомлення"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "Помилка при надсиланні повідомлення «%s»: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
 #, c-format
 msgid "Error sending message: %s"
 msgstr "Помилка надсилання повідомлення: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1577
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr ""
 "недостатній залишок для надсилання повідомлення. <a href='%s'>Поповнити</a>."
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "not capable"
 msgstr "не здатен"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "поза мережею"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "неправильний контакт"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "відмовлено у доступі"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "надто довге повідомлення"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "не реалізовано"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "невідомо"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "Тема:"
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Тема: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s змінив тему на: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "Тему не встановлено"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(Нема пропозицій)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2313
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Додати «%s» до словника"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2350
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Додати «%s» до словника %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "Вставити емоційку"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "_Надіслати"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "_Пропозиції з правопису"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2584
 msgid "Failed to retrieve recent logs"
 msgstr "Не вдалось одержати останні журнали"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s від'єднано"
@@ -1538,12 +1555,12 @@ msgstr "%s від'єднано"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s викинено користувачем %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s викинено"
@@ -1551,17 +1568,17 @@ msgstr "%s викинено"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s заблоковано користувачем %2$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s заблоковано"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s покинув кімнату"
@@ -1571,17 +1588,17 @@ msgstr "%s покинув кімнату"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s приєднався до бесіди"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2807
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s тепер відомий як %s"
@@ -1589,55 +1606,55 @@ msgstr "%s тепер відомий як %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:2847
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../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:2585
 msgid "Disconnected"
 msgstr "Від'єднаний"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3658
 msgid "Would you like to store this password?"
 msgstr "Зберегти цей пароль?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Remember"
 msgstr "Запам'ятати"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3674
 msgid "Not now"
 msgstr "Не зараз"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3718
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "Повторити"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3722
 msgid "Wrong password; please try again:"
 msgstr "Неправильний пароль; введіть пароль ще раз:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
 msgstr "Цю кімнату захищено паролем:"
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "Увійти"
 
-#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "З'єднаний"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "Розмова"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:4131
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1669,10 +1686,10 @@ msgstr "Редагувати заблоковані контакти"
 #. 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:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Обліковий запис:"
 
@@ -1682,7 +1699,7 @@ msgstr "Заблоковані контакти"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "Вилучити"
@@ -1705,39 +1722,30 @@ msgstr "_Відкрити посилання"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Редагувати інформацію про контакт"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "Особиста інформація"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "Новий контакт"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "Заблокувати %s?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../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 "Блокувати «%s» з контактів знову?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "За_блокувати"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../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] "_Звинуватити цей контакт в образі"
@@ -1745,83 +1753,16 @@ msgstr[1] "_Звинуватити ці контакти в образі"
 msgstr[2] "_Звинуватити ці контакти в образі"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "_Вирішити пізніше"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "Запит на підписку"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "За_блокувати користувача"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:207
-#: ../libempathy-gtk/empathy-individual-menu.c:1559
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "_Додати контакт…"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:282
-msgid "_Block Contact"
-msgstr "За_блокувати контакт"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:311
-#: ../libempathy-gtk/empathy-individual-menu.c:790
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "_Балачка"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:343
-#: ../libempathy-gtk/empathy-individual-menu.c:882
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Аудіовиклик"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-#: ../libempathy-gtk/empathy-individual-menu.c:927
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Відеовиклик"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:422
-#: ../libempathy-gtk/empathy-individual-menu.c:980
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Попередні бесіди"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:1021
-msgid "Send File"
-msgstr "Надіслати файл"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:467
-#: ../libempathy-gtk/empathy-individual-menu.c:1063
-msgid "Share My Desktop"
-msgstr "Оприлюднити мою стільницю"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../libempathy-gtk/empathy-individual-menu.c:1126
-msgid "Infor_mation"
-msgstr "Інфор_мація"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:536
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "З_міни"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:590
-#: ../libempathy-gtk/empathy-individual-menu.c:1317
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Запрошення до цієї кімнати"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:621
-#: ../libempathy-gtk/empathy-individual-menu.c:1363
-msgid "_Invite to Chat Room"
-msgstr "_Запросити до кімнати"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "_Вирішити пізніше"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1848,166 +1789,170 @@ msgstr "Повідомлення, яке представляє вас: "
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Будь ласка, повідомте мене, коли ви буде в мережі. Дякую!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:569
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Канали:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "Код ISO країни:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "Країна:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Регіон:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Місто:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Район:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "Поштовий індекс:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Вулиця:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Дім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Квартира:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Кімната:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Текст:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Адреса (URI):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Рівень точності:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "Помилка:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Вертикальна помилка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Горизонтальна помилка (метри):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Швидкість:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Азимут:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Швидкість підйому:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Останнє оновлення о:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Довгота:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Широта:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:795
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Висота:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Місцевість"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:865
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:917
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y у %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "Зберегти аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Неможливо зберегти аватар"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1098
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "Улюблений"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "Особисті відомості"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "Подробиці про контакт"
 
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
@@ -2074,54 +2019,49 @@ msgstr "поштовий"
 msgid "parcel"
 msgstr "посилковий"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Місцевість</b> у (дата)\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "Ідентифікатор:"
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "Псевдонім:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Інформація про використану програму"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Програма:"
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Місцевість</b> у (дата)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "Подробиці про контакт"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "Запит на інформацію…"
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "Ідентифікатор:"
+msgid "Client Information"
+msgstr "Інформація про використану програму"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "Запит на інформацію…"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Версія:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Програма:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2129,127 +2069,172 @@ msgstr ""
 "Виберіть групи, у яких має з'явитися контакт. Можна вибрати більше ніж одну "
 "групу або не вибирати зовсім."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "_Додати групу"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Вибрати"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "Група"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "Такий ідентифікатор буде заблоковано:"
 msgstr[1] "Такі ідентифікатори буде заборонено:"
 msgstr[2] "Такі ідентифікатори буде заборонено:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "Такий ідентифікатор неможливо заборонити:"
 msgstr[1] "Такі ідентифікатори неможливо заборонити:"
 msgstr[2] "Такі ідентифікатори неможливо заборонити:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Пов'язані контакти"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "Вибрати контакт для посилання"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "Перегляд нового контакту"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "Контакти вибрані в списку зліва буде сполучено разом."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Редагувати інформацію про контакт"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:149
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Вибрати обліковий запис для місця виклику"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:317
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../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 "Виклик"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Мобільний"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:384
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Робота"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:386
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "Дім"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "За_блокувати контакт"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "_Балачка"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:837
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1175
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Аудіовиклик"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Відеовиклик"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Попередні бесіди"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "Надіслати файл"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Оприлюднити мою стільницю"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Улюблений"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts не встановлено"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Встановіть gnome-contacts для одержання відомостей про контакт."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "Інфор_мація"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Редагувати"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1201
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "_Сполучити контакт…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "Запрошення до цієї кімнати"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "_Запросити до кімнати"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "_Додати контакт…"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "Вилучити і за_блокувати"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "Вилучити групу «%s»?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "Вилучення групи"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "Вилучити контакт «%s» з вашого списку?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2258,11 +2243,11 @@ msgstr ""
 "Вилучити сполучений контакт «%s»? Зауважте, це вилучить усі контакти, які "
 "складають список цього сполученого контакту."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "Вилучення контакту"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2274,23 +2259,23 @@ msgstr[2] "Сполучені контактів містять %u контак�
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Адреса</b> у (дата)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "У мережі через телефон або мобільний пристрій"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Нова мережа"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Виберіть мережу IRC"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Скинути список _мереж"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Вибрати"
@@ -2303,91 +2288,48 @@ msgstr "новий сервер"
 msgid "SSL"
 msgstr "Шифрування SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "Сполучити контакти"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "_Роз'єднати…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Повністю розділити показані сполучені контакти в окремі контакти."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_Сполучити"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Роз'єднати сполучені контакти «%s»?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Роз'єднати ці сполучені контакти? Це повністю розділить сполучені контакти в "
-"окремі контакти."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_Роз'єднати"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "Історія"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "Показати"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "Пошук"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "Балачка в %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "Балачка з %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y, %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2395,7 +2337,7 @@ msgstr[0] "%s секунду"
 msgstr[1] "%s секунди"
 msgstr[2] "%s секунд"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2403,186 +2345,186 @@ msgstr[0] "%s хвилину"
 msgstr[1] "%s хвилини"
 msgstr[2] "%s хвилин"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Виклик прийнято в %s, закінчено о %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "Сьогодні"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "Вчора"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "Будь-коли"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "Будь-хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "Хто"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "Коли"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "Будь-що"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "Текстова балачка"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "Вхідні виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "Вихідні виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "Пропущені виклики"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "Що"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "Вилучити всі журнали з попередньої розмови?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "Очистити все"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "Вилучити з:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">Завантаження…</span>"
+msgid "_File"
+msgstr "_Файл"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Балачка"
+#: ../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 "З_міни"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "Вилучити всю історію…"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Профіль"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Відео"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Балачка"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "З_міни"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Відео"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Файл"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "сторінка 2"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">Завантаження…</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
 msgstr "Контакт поза мережею"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
 msgstr "Вказаний контакт недійсний або невідомий"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "Контакт не підтримує такого роду розмову"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "Потрібну функціональність не впроваджено для цього протоколу"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "Неможливо почати розмову із заданих контактом"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "Ви заблоковані на цьому каналі"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "Цей канал переповнений"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
 msgstr "Щоб приєднатись до цього каналу, потрібно бути запрошеним"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
 msgstr "Неможливо продовжувати протягом від'єднання"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
 msgstr "Відмовлено в доступі"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
 msgstr "Помилка започаткування розмови"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../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 "Введіть ідентифікатор контакту або номер телефону:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Нова розмова"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "_Відеовиклик"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "_Аудіовиклик"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "Створити виклик"
 
@@ -2638,7 +2580,7 @@ msgstr "Власні повідомлення…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "Новий обліковий запис %s"
@@ -2648,20 +2590,20 @@ msgid "Find:"
 msgstr "Знайти:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "З _урахуванням регістру"
+msgid "_Previous"
+msgstr "_Назад"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Фразу не знайдено"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_Далі"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "З _урахуванням регістру"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Назад"
+msgid "Phrase not found"
+msgstr "Фразу не знайдено"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2707,12 +2649,12 @@ msgstr "Голосовий виклик закінчено"
 msgid "Edit Custom Messages"
 msgstr "Редагувати власні повідомлення"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Повідомлення змінено в %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Звичайна"
 
@@ -2788,34 +2730,38 @@ msgid "Certificate hostname: %s"
 msgstr "Назва вузла сертифіката: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "Продовжити"
+msgid "C_ontinue"
+msgstr "Пр_одовжити"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Надійне з'єднання"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Це ненадійне з'єднання. Однаково продовжити?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Запам'ятати вибір для подальших з'єднань"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Подробиці про сертифікат"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
 msgid "Unable to open URI"
 msgstr "Неможливо відкрити URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
 msgid "Select a file"
 msgstr "Вибрати файл"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
 msgid "Insufficient free space to save file"
 msgstr "Недостатньо вільного місця для збереження файла"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2824,7 +2770,7 @@ msgstr ""
 "Потрібно %s вільного місця для збереження цього файла, проте доступно лише "
 "%s. Будь ласка, виберіть інакше місце."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
 #, c-format
 msgid "Incoming file from %s"
 msgstr "Вхідний файл з %s"
@@ -3004,23 +2950,23 @@ msgstr "Немає повідомлення про помилку"
 msgid "Instant Message (Empathy)"
 msgstr "Миттєві повідомлення (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "Не з'єднуватися під час запуску"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "Не показувати список контактів чи інші вікна під час запуску"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "— клієнт обміну миттєвими повідомленнями Empathy"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "Помилка менеджера облікових записів"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3078,223 +3024,83 @@ msgstr ""
 "Сергій Панасенко <nitay@users.sourceforge.net>\n"
 "Daniel Korostil <ted.korostiled@gmail.com>"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "Помилка при імпортуванні облікових записів"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "Помилка при аналізуванні даних облікових записів."
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "Помилка при створенні облікових записів."
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "Виникла помилка."
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "Повідомлення про помилку: %s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"Ви можете або повернутись назад та спробувати ввести дані вашого облікового "
-"запису або завершити помічника та додати облікові записи потім у меню "
-"«Зміни»."
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
-msgid "An error occurred"
-msgstr "Виникла помилка"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "Який тип облікового запису для балачки ви маєте?"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "Маєте будь-який інший обліковий запис балачки, який треба налаштувати?"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "Введіть подробиці облікового запису"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "Який тип облікового запису для балачки створити?"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "Маєте будь-які інші облікові запису для балачки?"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "Введіть параметри нового облікового запису"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"Empathy підтримує балачки з іншими особами у мережі та з друзями і колегами, "
-"які користуються Google Talk, AIM, Windows Live та багатьма іншими "
-"програмами спілкування. Якщо у вас є мікрофон чи веб-камера, ви також можете "
-"робити голосові та відеовиклики."
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "У вас є обліковий запис, який ви використовувати з іншою програмою?"
-
-#: ../src/empathy-account-assistant.c:653
-msgid "Yes, import my account details from "
-msgstr "Так, імпортувати параметри облікового запису з "
-
-#: ../src/empathy-account-assistant.c:674
-msgid "Yes, I'll enter my account details now"
-msgstr "Так, я введу параметри облікового запису вручну"
-
-#: ../src/empathy-account-assistant.c:696
-msgid "No, I want a new account"
-msgstr "Ні, я бажаю створити новий обліковий запис"
-
-#: ../src/empathy-account-assistant.c:706
-msgid "No, I just want to see people online nearby for now"
-msgstr "Ні, я просто бажаю бачити людей, які у мережі й поблизу"
-
-#: ../src/empathy-account-assistant.c:727
-msgid "Select the accounts you want to import:"
-msgstr "Виберіть обліковий запис для імпортування:"
-
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "Так"
-
-#: ../src/empathy-account-assistant.c:821
-msgid "No, that's all for now"
-msgstr "Ні, наразі досить"
-
-#: ../src/empathy-account-assistant.c:1086
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy може автоматично знайти людей, приєднаних до тієї ж мережі, що й ви. "
-"Якщо ви хочете використовувати цю можливість, відмітьте, що наведена нижче "
-"інформація є коректною. Ви можете змінити цю інформацію пізніше або вимкнути "
-"цю можливість, використовуючи вікно «Облікові записи»."
-
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
-msgid "Edit->Accounts"
-msgstr "Зміни->Облікові записи"
-
-#: ../src/empathy-account-assistant.c:1108
-msgid "I do _not want to enable this feature for now"
-msgstr "Ні, я _не бажаю зараз вмикати цю функцію"
-
-#: ../src/empathy-account-assistant.c:1144
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"Ви не можете спілкуватися з людьми, приєднаними до вашої локальної мережі, "
-"оскільки не встановлено telepathy-salut. Якщо вам потрібна ця можливість, "
-"встановіть пакет telepathy-salut та створіть обліковий запис «Люди поблизу» "
-"у вікні «Облікові записи»"
-
-#: ../src/empathy-account-assistant.c:1150
-msgid "telepathy-salut not installed"
-msgstr "Не встановлено telepathy-salut"
-
-#: ../src/empathy-account-assistant.c:1196
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "Листування та облікові записи VoIP"
-
-#: ../src/empathy-account-assistant.c:1230
-msgid "Welcome to Empathy"
-msgstr "Ласкаво просило до Empathy"
-
-#: ../src/empathy-account-assistant.c:1239
-msgid "Import your existing accounts"
-msgstr "Імпортувати наявні облікові записи"
-
-#: ../src/empathy-account-assistant.c:1257
-msgid "Please enter personal details"
-msgstr "Введіть персональну інформацію"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Є незбережені зміни у вашому обліковому записі %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "Новий обліковий запис ще не збережено."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-accounts-dialog.c:370
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "З'єднання…"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "Поза мережею — %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "Від'єднаний — %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "Поза мережею — немає з'єднання з мережею"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "Невідомий стан"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"Цей обліковий запис вимкнено, бо воно спирається на старий, непідтримуваний "
+"модуль. Установіть telepathy-haze й перезавантажте сеанс, щоб перемістити "
+"обліковий запис. "
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "Поза мережею — Обліковий запис вимкнено"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Ви намагаєтесь створити новий обліковий запис, що призведе до\n"
-"відкидання змін. Продовжити?"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "Редагувати параметри з'єднання"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Не вдалось одержати ваших особистих відомостей із сервера."
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "Увійти в мережу, щоб редагувати особисті відомості."
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "_Редагувати параметри з'єднання…"
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Вилучити «%s» з комп'ютера?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "Це не призведе до вилучення облікового запису на сервері."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3303,15 +3109,23 @@ msgstr ""
 "відкидання змін. Продовжити?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "_Увімкнено"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "_Вимкнено"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "_Пропустити"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "_З'єднатись"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3323,19 +3137,15 @@ msgstr ""
 msgid "Add…"
 msgstr "Додати…"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "Завантаження інформатизації про обліковий запис"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Немає встановлених протоколів"
+msgid "_Import…"
+msgstr "_Імпортувати…"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "Протокол:"
+msgid "Loading account information"
+msgstr "Завантаження інформатизації про обліковий запис"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3343,120 +3153,116 @@ msgstr ""
 "Щоб додати новий обліковий запис, встановіть підтримування кожного "
 "потрібного протоколу."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "_Імпортувати…"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "Не встановлено жодного протокольного модуля "
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
 msgstr " — клієнт автентифікації Empathy"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:304
 msgid "Empathy authentication client"
 msgstr "Клієнт аутентифікація Empathy"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "Люди поблизу"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "— аудіо- та відеоклієнт Empathy"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Аудіо- та відеоклієнт Empathy"
 
-#: ../src/empathy-streamed-media-window.c:433
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "Контраст"
 
-#: ../src/empathy-streamed-media-window.c:436
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "Яскравість"
 
-#: ../src/empathy-streamed-media-window.c:439
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "Гамма"
 
-#: ../src/empathy-streamed-media-window.c:545
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "Гучність"
 
-#: ../src/empathy-streamed-media-window.c:1097
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "_Бічна панель"
 
-#: ../src/empathy-streamed-media-window.c:1117
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "Звуковий вхід"
 
-#: ../src/empathy-streamed-media-window.c:1121
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "Відеовхід"
 
-#: ../src/empathy-streamed-media-window.c:1129
+#: ../src/empathy-streamed-media-window.c:1131
 msgid "Dialpad"
 msgstr "Панель набору"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1142
 msgid "Details"
 msgstr "Подробиці"
 
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "Виклик з %s"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "Адреса IP, яку показано на машині"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Адреса IP, яку показано на сервері через інтернет"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "Адреса IP вузла, яку показано по ту сторону"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "Адреса IP сервера ретрансляції"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "Адреса IP групової трансляції"
 
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
+#: ../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
 msgctxt "codec"
 msgid "Unknown"
 msgstr "Невідомо"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "З'єднання — %d:%02dm "
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "Технічні подробиці"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -3464,8 +3270,8 @@ msgid ""
 msgstr ""
 "Програма %s не розпізнає аудіоформати, що підтримуються вашим комп'ютером"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -3473,8 +3279,8 @@ msgid ""
 msgstr ""
 "Програма %s не розпізнає відеоформати, що підтримуються вашим комп'ютером"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3483,29 +3289,29 @@ msgstr ""
 "Не вдалось встановити з'єднання з %s. Один з вас може знаходитися у мережі, "
 "яка не підтримує прямі з'єднання."
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "Помилка мережі"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Аудіоформати, що потрібні для цього виклику, не встановлено на вашому "
 "комп'ютері"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Відеоформати, що потрібні для цього виклику, не встановлено на вашому "
 "комп'ютері"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3322,211 @@ msgstr ""
 "помилку</a> та прикріпіть журнали, зібрані з вікна зневадження у меню "
 "«Довідка»."
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "Помилка у рушії виклику"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "Досягнуто кінця потоку"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "Не вдалось встановити аудіопотік"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "Не вдалось встановити відеопотік"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Аудіо"
+msgid "_Call"
+msgstr "_Виклик"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Кодек декодування:"
+msgid "_Microphone"
+msgstr "_Мікрофон"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "Вимкнути камеру"
+msgid "_Camera"
+msgstr "_Камера"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "Показати панель набору"
+msgid "_Settings"
+msgstr "_Параметри"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Кодек кодування:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "П_ерегляд"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Розірвати зв'язок"
+#: ../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 "_Довідка"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Завершити поточний виклик"
+#: ../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 "_Зміст"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Локальні кандидати:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Зневад_ження"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "Розгорнути мене"
+msgid "Swap camera"
+msgstr "Замінити камеру"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Згорнути мене"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Віддалений кандидат:"
+msgid "Maximise me"
+msgstr "Розгорнути мене"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "Надіслати звук"
+msgid "Disable camera"
+msgstr "Вимкнути камеру"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "Надіслати відео"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Розірвати зв'язок"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "Показати панель набору"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Завершити поточний виклик"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Відеовиклик"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "Зробити відеовиклик"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "Зробити аудіовиклик"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Замінити камеру"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "Перемкнути передавання звуку"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "Перемкнути передавання відео"
+msgid "Show dialpad"
+msgstr "Показати панель набору"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "Невідомо"
+msgid "Display the dialpad"
+msgstr "Показати панель набору"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "Надіслати відео"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Відеовиклик"
+msgid "Toggle video transmission"
+msgstr "Перемкнути передавання відео"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Виклик"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "Надіслати звук"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Камера"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_Зміст"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "Перемкнути передавання звуку"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Зневад_ження"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Кодек кодування:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "_Довідка"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "Невідомо"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Кодек декодування:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "_Мікрофон"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Віддалений кандидат:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "_Параметри"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Локальні кандидати:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "П_ерегляд"
+msgid "Audio"
+msgstr "Аудіо"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "Закрити це вікно?"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Закриття цього вікна покине %s. Ви не одержуватимете подальші повідомлення, "
+"поки не приєднаєтесь знову."
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Закриття цього вікна покине %u кімнату балачки. Ви не одержуватимете подальші "
+"повідомлення, поки не приєднаєтесь знову."
+msgstr[1] ""
+"Закриття цього вікна покине %u кімнати балачки. Ви не одержуватимете "
+"подальші повідомлення, поки не приєднаєтесь знову."
+msgstr[2] ""
+"Закриття цього вікна покине %u кімнат балачки. Ви не одержуватимете подальші "
+"повідомлення, поки не приєднаєтесь знову."
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "Покинути %s? "
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "Ви не одержуватимете подальші повідомлення, поки не приєднаєтесь знову."
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "Закрити вікно"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "Покинути кімнату"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3678,7 +3534,7 @@ msgstr[0] "%s (%d непрочитане)"
 msgstr[1] "%s (%d непрочитаних)"
 msgstr[2] "%s (%d непрочитані)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3686,7 +3542,7 @@ msgstr[0] "%s (та %u інше)"
 msgstr[1] "%s (та %u інших)"
 msgstr[2] "%s (та %u інших)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3694,7 +3550,7 @@ msgstr[0] "%s (%d непрочитане від інших)"
 msgstr[1] "%s (%d непрочитаних від інших)"
 msgstr[2] "%s (%d непрочитаний від інших)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3702,11 +3558,11 @@ msgstr[0] "%s (%d непрочитане від усіх)"
 msgstr[1] "%s (%d непрочитаних від усіх)"
 msgstr[2] "%s (%d непрочитаний від усіх)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3714,69 +3570,69 @@ msgstr[0] "Надсилання %d повідомлення"
 msgstr[1] "Надсилання %d повідомлень"
 msgstr[2] "Надсилання %d повідомлень"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "Набирає повідомлення."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "О_чистити"
+msgid "_Conversation"
+msgstr "_Розмова"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Контакт"
+msgid "C_lear"
+msgstr "О_чистити"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Вставити _емоційку"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "_Улюблена кімната"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "Запросити _учасника…"
+msgid "Notify for All Messages"
+msgstr "Сповіщати про всі повідомлення"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Перемістити вкладку _ліворуч"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "Показати _список контактів"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Перемістити вкладку _праворуч"
+msgid "Invite _Participant…"
+msgstr "Запросити _учасника…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Сповіщати про всі повідомлення"
+msgid "C_ontact"
+msgstr "_Контакт"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Розмова"
+msgid "_Tabs"
+msgstr "_Вкладки"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_Відокремити вкладку"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "_Улюблена кімната"
+msgid "_Previous Tab"
+msgstr "_Попередня закладка"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_Наступна закладка"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Попередня закладка"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Повернути закриті вкладки"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "Показати _список контактів"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Перемістити вкладку _ліворуч"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Вкладки"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Перемістити вкладку _праворуч"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Повернути закриті вкладки"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_Відокремити вкладку"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3790,100 +3646,100 @@ msgstr "Кімната"
 msgid "Auto-Connect"
 msgstr "Автоматичне з'єднання"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Керування улюбленими кімнатами"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "Вхідний відеовиклик"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "Вхідний виклик"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "Відеовиклик від %s, відповісти?"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "Виклик від %s, відповісти?"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "Вхідний виклик від %s"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "Від_хилити"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "_Відповісти"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "_Відповісти через відео"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "Вхідний відеовиклик від %s"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "Кімната запрошення"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Запрошення приєднатись до %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s запрошує вас увійти у %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "Від_хилити"
 
-#: ../src/empathy-event-manager.c:860
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_Увійти"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s запросив вас увійти у %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Вас запрошено приєднатись до %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Вхідне передавання файла від %s"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "Потрібно пароль"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s потребує дозволу, щоб знати, коли ви в мережі"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -4003,7 +3859,11 @@ msgstr "Передавання файлів"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "Вилучення завершено, скасовано й помилка передавання файлів зі списку"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "_Імпортувати"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
@@ -4011,170 +3871,185 @@ msgstr ""
 "Не знайдено облікових записів для імпортування. Empathy на цей момент "
 "підтримує імпортування контактів лише з Pidgin."
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "Імпортування облікових записів"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "Імпортувати"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "Протокол:"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "Джерело"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "Вкажіть пароль"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "Від'єднати"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "Потрібно налаштувати обліковий запис, щоб побачити контакти тут."
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "Збігів не знайдено"
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr ""
-"Вибачте, обліковий запис %s неможливо використовувати, поки програму %s не буде "
-"оновлено."
+"Вибачте, обліковий запис %s неможливо використовувати, поки програму %s не "
+"буде оновлено."
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "Оновити програму…"
 
-#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "Закрити"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "Перез'єднати"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "Редагування облікового запису"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Поповнити %s (%s)…"
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "Поповнити рахунок"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "Поповнити…"
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Потрібно ввімкнути один з облікових записів, щоб побачити контакти тут."
+
+#. 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 "Потрібно ввімкнути %s, щоб побачити контакти тут."
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "Список контактів"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Контакти на _карті"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "Параметри облікового запису"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Залишок"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "_Нова розмова…"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "Знайти у _списку контактів"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "Новий _виклик…"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "Залучити _улюблених"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "_Пошук для контактів…"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Налаштувати _улюблених"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Передавання _файлів"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "З_вичайний розмір"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "_Показувати відсутніх"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "Новий _виклик…"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "Показати _протокол:"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Звичайний розмір _аватарів"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Залишок"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Контакти на _карті"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "_Облікові записи"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "За_блоковані контакти"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Параметри"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "Показати _протокол:"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "Знайти у _списку контактів"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "Впорядкувати за _псевдонімом"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "Впорядкувати за с_таном"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "_Облікові записи"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Звичайний розмір _аватарів"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "За_блоковані контакти"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "З_вичайний розмір"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Компактний розмір"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Передавання _файлів"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Кімната"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "_Увійти…"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "_Нова розмова…"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "_Показувати відсутніх"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "_Особиста інформація"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Кімната"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "Залучити _улюблених"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "_Пошук для контактів…"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Налаштувати _улюблених"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4186,7 +4061,7 @@ msgstr "Учасники"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4199,22 +4074,27 @@ msgstr ""
 "Вимога паролю: %s\n"
 "Учасники: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "Так"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ні"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Неможливо перелічити кімнати"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Неможливо зупинити перелічування кімнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Неможливо завантажити список кімнат"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "Увійти у кімнату"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4224,6 +4104,10 @@ msgstr ""
 "декілька кімнат зі списку."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Кімната:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4231,18 +4115,14 @@ msgstr ""
 "Введіть сервер бесіди, або залиште порожнім, якщо бесіда знаходиться на "
 "поточному сервері"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "Увійти у кімнату"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Неможливо завантажити список кімнат"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Список бесід"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Кімната:"
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Надійшло повідомлення"
@@ -4256,7 +4136,7 @@ msgid "New conversation"
 msgstr "Нова розмова"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Контакт входить у мережу"
 
 #: ../src/empathy-preferences.c:170
@@ -4276,373 +4156,398 @@ msgid "Language"
 msgstr "Мова"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Джульєтта"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Ромео"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Ромео! О, навіщо ти Ромео?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Зміни своє ім'я, зречися батька;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Як ні, то присягни мені в коханні,"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "І більше я не буду Капулетті."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Послухать — чи відповісти відразу?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Джульєтта від'єдналась."
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Параметри"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "Показувати _емоційки графічно"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "Показати _список контактів у кімнаті"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Вигляд"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "Поведінка"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "Розпочати розмову в:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "Т_ема бесіди:"
+msgid "new ta_bs"
+msgstr "новій вк_ладці"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "Вимкнути сповіщення у стані «_відійшов» або «зайнятий»"
+msgid "new _windows"
+msgstr "новому _вікні"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "Вимкнути звуки у стані «_відійшов» або «зайнятий»"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "Показувати вхідні події в ділянці сповіщень"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Автоматично з'єднуватись при запуску"
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Усунення відлуння допоможе зробити ваш голос чистішим для інших, але може "
-"викликати певні проблеми на деяких комп'ютерах. Якщо ви або інша особа чує "
-"дивні звуки або дефекти протягом дзвінка, спробуйте вимкнути усунення "
-"відлуння і передзвонити."
+msgid "Log conversations"
+msgstr "Журнал розмов"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "Показувати сповіщення, коли контакт входить в мережу"
+msgid "Behavior"
+msgstr "Поведінка"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "Показувати сповіщення, коли контакт залишає мережу"
+msgid "General"
+msgstr "Загальне"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "Показувати сповіщення, коли вікно _чату не активне"
+msgid "_Enable bubble notifications"
+msgstr "_Ввімкнути контекстні сповіщення"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "Увімкнути перевіряння орфографії для мов:"
+msgid "Disable notifications when _away or busy"
+msgstr "Вимкнути сповіщення у стані «_відійшов» або «зайнятий»"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "Загальне"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "Показувати сповіщення, коли вікно _чату не активне"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "Показувати сповіщення, коли контакт входить в мережу"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "Джерела місцевості:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "Показувати сповіщення, коли контакт залишає мережу"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "Журнал розмов"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "Сповіщення"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "_Ввімкнути звукові сповіщення"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "Звукові сигнали при подіях"
+msgid "Disable sounds when _away or busy"
+msgstr "Вимкнути звуки у стані «_відійшов» або «зайнятий»"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "Приватність"
+msgid "Play sound for events"
+msgstr "Звукові сигнали при подіях"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"Зниження точності визначення місцевості дозволяє публікувати лише місто,"
-"регіон та країну. Точність GPS координат визначається 1 десятковою позицією."
-
-#: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "Показувати _емоційки графічно"
-
-#: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "Показати _список контактів у кімнаті"
-
-#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "Звуки"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "Перевіряння орфографії"
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Скористатись усуненням від_луння для покращення якості викликів"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"<small>У цьому списку показані лише мови, для яких встановлено словники.</"
-"small>"
+"Усунення відлуння допоможе зробити ваш голос чистішим для інших, але може "
+"викликати певні проблеми на деяких комп'ютерах. Якщо ви або інша особа чує "
+"дивні звуки або дефекти протягом дзвінка, спробуйте вимкнути усунення "
+"відлуння і передзвонити."
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "Теми"
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "_Публікувати місцевості моїм контактам"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "Скористатись усуненням від_луння для покращення якості викликів"
+#: ../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 ""
+"Зниження точності визначення місцевості дозволяє публікувати лише місто,"
+"регіон та країну. Точність GPS координат визначається 1 десятковою позицією."
 
+#. 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 "Variant:"
-msgstr "Варіант:"
+msgid "_Reduce location accuracy"
+msgstr "По_низити точність визначення місцевості"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "_Автоматично з'єднуватись при запуску"
+msgid "Privacy"
+msgstr "Приватність"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "_Мобільний телефон"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "_Ввімкнути контекстні сповіщення"
+msgid "_Cellphone"
+msgstr "_Мобільний телефон"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "_Ввімкнути звукові сповіщення"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "_Мережа (IP, Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "Джерела місцевості:"
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "_Відкривати нові бесіди в окремому вікні"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"<small>У цьому списку показані лише мови, для яких встановлено словники.</"
+"small>"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "_Публікувати місцевості моїм контактам"
+msgid "Enable spell checking for languages:"
+msgstr "Увімкнути перевіряння орфографії для мов:"
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "Перевіряння орфографії"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "По_низити точність визначення місцевості"
+msgid "Chat Th_eme:"
+msgstr "Т_ема бесіди:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "Варіант:"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Теми"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Стан"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "Ви_йти"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Викликати контакт знову"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Вимкнути камеру"
+msgid "Redial"
+msgstr "Повторно набрати номер"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Увімкнути камеру"
+msgid "V_ideo"
+msgstr "_Відео"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Вимкнути відео"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "Вимкнути камеру та зупинити передавання відео"
+msgid "Video Preview"
+msgstr "Перегляд відео"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "Увімкнути камеру та передавати відео"
+msgid "Video On"
+msgstr "Увімкнути відео"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "Увімкнути камеру, але не передавати відео"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Викликати контакт знову"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Перегляд"
+msgid "Camera Off"
+msgstr "Вимкнути камеру"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Повторно набрати номер"
+msgid "Disable camera and stop sending video"
+msgstr "Вимкнути камеру та зупинити передавання відео"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "_Відео"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Перегляд"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Вимкнути відео"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "Увімкнути камеру, але не передавати відео"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Увімкнути відео"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Увімкнути камеру"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Перегляд відео"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "Увімкнути камеру та передавати відео"
 
-#: ../src/empathy-map-view.c:458
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Карта контактів"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "Зберегти"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Посилання Pastebin"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Відповідь Pastebin"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "Дані надто довгі для одного вставлення. Збережіть журнали у файл."
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "Вікно зневадження"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "Надіслати у pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "Рівень"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "Зневадження"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "Інформація"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "Повідомлення"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "Критична"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "Помилка"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "Час"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "Домен"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "Категорія"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "Рівень"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr ""
 "Вибраний менеджер з'єднань не підтримує розширення віддаленого зневадження "
 
-#: ../src/empathy-invite-participant-dialog.c:198
-#: ../src/empathy-invite-participant-dialog.c:226
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
 msgid "Invite Participant"
 msgstr "Запросити учасника"
 
-#: ../src/empathy-invite-participant-dialog.c:199
+#: ../src/empathy-invite-participant-dialog.c:203
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Виберіть контакт для запрошення до бесіди:"
 
-#: ../src/empathy-invite-participant-dialog.c:222
+#: ../src/empathy-invite-participant-dialog.c:226
 msgid "Invite"
 msgstr "Запросити"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr ""
 "Не показувати вікна; виконати роботу (наприклад, імпортування) та вийти"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr ""
 "Не показувати які-небудь вікна, якщо це не обліковий запис «Людей поблизу»"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr ""
 "Спочатку виберіть заданий обліковий запис (наприклад, gabble/jabber/"
 "foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "Показувати помічника облікових записів"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "— облікові записи Empathy"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Облікові записи Empathy"
 
@@ -4658,85 +4563,85 @@ msgstr "— зневадження Empathy"
 msgid "Empathy Debugger"
 msgstr "Зневадження Empathy"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "— клієнт балачок Empathy"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "Відгукнутись"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "Відкинути"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "Відповісти"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "Відповісти через відео"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "Відхилити"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "Прийняти"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "Надати"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s намагався зв'язатись з вами, але втой час ви мали розмову з іншим."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "і"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "В очікуванні"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "Приглушити"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "Тривалість"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "Ваш поточний залишок становить %s."
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Вибачте, але у вас недостатньо залишку, щоб здійснити виклик."
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "Поповнити"
 
@@ -4744,6 +4649,227 @@ msgstr "Поповнити"
 msgid "_Match case"
 msgstr "_З урахуванням регістру"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "Який тип облікового запису для балачки ви маєте?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "Додання облікового запису"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "Люди поблизу"
+
+#: ../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."
+msgstr ""
+"Empathy може автоматично шукати і розмовляти з людьми, під'єднаних до однієї "
+"ж мережі з вами. Якщо бажаєте скористатись такою можливістю, перевірте, чи "
+"подробиці нижче правильні."
+
+#: ../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 ""
+"Можете змінити ці подробиці згодом або вимкнути цю можливість, вибравши "
+"<span style=\"italic\">Зміни → Облікові записи</span> у списку контактів."
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Мої мережеві облікові записи "
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Обліковий запис %s змінено через %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Обліковий запис %s неможливо редагувати в Empathy."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Запустити мій обліковий запис із сайту"
+
+#~ msgid "Edit %s"
+#~ msgstr "Редагувати %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "_Скасувати"
+
+#~ msgid "Personal Information"
+#~ msgstr "Особиста інформація"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "З_міни"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Пов'язані контакти"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Вибрати контакт для посилання"
+
+#~ msgid "New contact preview"
+#~ msgstr "Перегляд нового контакту"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "Контакти вибрані в списку зліва буде сполучено разом."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "_Сполучити контакт…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "Сполучити контакти"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "_Роз'єднати…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Повністю розділити показані сполучені контакти в окремі контакти."
+
+#~ msgid "_Link"
+#~ msgstr "_Сполучити"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Роз'єднати сполучені контакти «%s»?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Роз'єднати ці сполучені контакти? Це повністю розділить сполучені "
+#~ "контакти в окремі контакти."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_Роз'єднати"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "Помилка при імпортуванні облікових записів"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "Помилка при аналізуванні даних облікових записів."
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "Помилка при створенні облікових записів."
+
+#~ msgid "There was an error."
+#~ msgstr "Виникла помилка."
+
+#~ msgid "The error message was: %s"
+#~ msgstr "Повідомлення про помилку: %s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "Ви можете або повернутись назад та спробувати ввести дані вашого "
+#~ "облікового запису або завершити помічника та додати облікові записи потім "
+#~ "у меню «Зміни»."
+
+#~ msgid "An error occurred"
+#~ msgstr "Виникла помилка"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr ""
+#~ "Маєте будь-який інший обліковий запис балачки, який треба налаштувати?"
+
+#~ msgid "Enter your account details"
+#~ msgstr "Введіть подробиці облікового запису"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "Який тип облікового запису для балачки створити?"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "Маєте будь-які інші облікові запису для балачки?"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "Введіть параметри нового облікового запису"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "Empathy підтримує балачки з іншими особами у мережі та з друзями і "
+#~ "колегами, які користуються Google Talk, AIM, Windows Live та багатьма "
+#~ "іншими програмами спілкування. Якщо у вас є мікрофон чи веб-камера, ви "
+#~ "також можете робити голосові та відеовиклики."
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "У вас є обліковий запис, який ви використовувати з іншою програмою?"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "Так, імпортувати параметри облікового запису з "
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "Так, я введу параметри облікового запису вручну"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "Ні, я бажаю створити новий обліковий запис"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "Ні, я просто бажаю бачити людей, які у мережі й поблизу"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "Виберіть обліковий запис для імпортування:"
+
+#~ msgid "No, that's all for now"
+#~ msgstr "Ні, наразі досить"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "Зміни->Облікові записи"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "Ні, я _не бажаю зараз вмикати цю функцію"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "Ви не можете спілкуватися з людьми, приєднаними до вашої локальної "
+#~ "мережі, оскільки не встановлено telepathy-salut. Якщо вам потрібна ця "
+#~ "можливість, встановіть пакет telepathy-salut та створіть обліковий запис "
+#~ "«Люди поблизу» у вікні «Облікові записи»"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "Листування та облікові записи VoIP"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "Ласкаво просило до Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "Імпортувати наявні облікові записи"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "Введіть персональну інформацію"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ви намагаєтесь створити новий обліковий запис, що призведе до\n"
+#~ "відкидання змін. Продовжити?"
+
+#~ msgid "Protocol:"
+#~ msgstr "Протокол:"
+
+#~ msgid "_Personal Information"
+#~ msgstr "_Особиста інформація"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Відкривати нові бесіди в окремому вікні"
+
+#~ msgid "Show account assistant"
+#~ msgstr "Показувати помічника облікових записів"
+
 #~ msgid "Call volume"
 #~ msgstr "Гучність виклику"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1f83f27e6..d78765b93 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,17 +15,19 @@
 # Tao Wang <dancefire@gmail.com>, 2010.
 # Dean Lee <xslidian@gmail.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Yinghua Wang <wantinghard@gmail.com>, 2010
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
 # zhen liu  <liuzhen1191@gmail.com>, 2011
+# Yangtse Su <yangtsesu@gmail.com>, 2011
+# Mike Manilone <crtmike@gmail.com>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-11-24 11:51+0000\n"
-"PO-Revision-Date: 2011-11-25 21:46+0800\n"
-"Last-Translator: Yangtse Su <yangtsesu@gmail.com>\n"
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-02-26 11:57+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,472 +36,520 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "即时通讯客户端"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Empathy 即时通讯程序"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "即时通讯客户端"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "消息和 VoIP 帐号"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理消息和 VoIP 帐号"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "总是为新聊天打开单独的聊天窗口。"
+msgid "Connection managers should be used"
+msgstr "应该使用连接管理器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Camera device"
-msgstr "相机设备"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是否使用连接管理器自动断开连接或重新连接。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Camera position"
-msgstr "相机位置"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy 启动时是否自动连接"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy 是否在启动时自动登入您的帐号。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Chat window theme"
-msgstr "聊天窗口主题"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是否自动离开"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Chat window theme variant"
-msgstr "聊天窗口主题衍生"
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
+msgid "Empathy default download folder"
+msgstr "Empathy 默认下载文件夹"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Compact contact list"
-msgstr "紧凑显示联系人列表"
+msgid "The default folder to save file transfers in."
+msgstr "保存传送文件的默认文件夹。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Connection managers should be used"
-msgstr "应该使用连接管理器"
+msgid "Show offline contacts"
+msgstr "显示离线联系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Contact list sort criterion"
-msgstr "联系人列表排序条件"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "是否显示联系人清单中离线的联系人。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "D-Bus object path of the last account selected to join a room."
-msgstr ""
+msgid "Show avatars"
+msgstr "显示头像"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default directory to select an avatar image from"
-msgstr "默认的选取头像图片的目录"
+msgid "Show protocols"
+msgstr "显示协议"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Disable popup notifications when away"
-msgstr "离开时禁用弹出提示"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示协议。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable sounds when away"
-msgstr "离开时禁用声音"
+msgid "Show Balance in contact list"
+msgstr "在联系人列表中显示余额"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Display incoming events in the status area"
-msgstr "在状态栏显示呼入事件。"
+msgid "Whether to show account balances in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示余额。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
+msgid "Compact contact list"
+msgstr "紧凑显示联系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Echo cancellation support"
-msgstr "回声抑制支持"
+msgid "Whether to show the contact list in compact mode."
+msgstr "是否以紧凑模式显示联系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy can publish the user's location"
-msgstr "Empathy 能够发布用户的位置"
+msgid "Hide main window"
+msgstr "隐藏主窗口"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS 来估计位置"
+msgid "Hide the main window."
+msgstr "隐藏主窗口。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机来估计位置"
+msgid "Default directory to select an avatar image from"
+msgstr "默认的选取头像图片的目录"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络来估计位置"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "上次选取头像图片的目录。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy default download folder"
-msgstr "Empathy 默认下载文件夹"
+msgid "Open new chats in separate windows"
+msgstr "在单独窗口中打开新聊天"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy 空闲时是否自动离开"
+msgid "Always open a separate chat window for new chats."
+msgstr "总是为新聊天打开单独的聊天窗口。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy 启动时是否自动连接"
+msgid "Display incoming events in the status area"
+msgstr "在状态栏显示呼入事件。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should reduce the location's accuracy"
-msgstr "降低 Emapthy 位置信息的准确度"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
+msgid "The position for the chat window side pane"
+msgstr "聊天窗口边栏的位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Enable WebKit Developer Tools"
-msgstr "启用 WebKit 开发工具"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "聊天窗口边栏保存的位置(像素)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Enable popup notifications for new messages"
-msgstr "启用新消息弹出提示"
+msgid "Show contact groups"
+msgstr "显示联系人分组"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable spell checker"
-msgstr "启用拼写检查器"
+msgid "Whether to show groups in the contact list."
+msgstr "是否在联系人列表中显示分组。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Hide main window"
-msgstr "隐藏主窗口"
+msgid "Contact list sort criterion"
+msgstr "联系人列表排序条件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Hide the main window."
-msgstr "隐藏主窗口。"
+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 ""
+"使用何种条件来排序联系人列表。默认情况下使用值“状态”以按联系人状态排序。取值"
+"为“姓名”时将按姓名排序联系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Last account selected in Join Room dialog"
-msgstr "在加入聊天室对话框中最后选择的帐号"
+msgid "Use notification sounds"
+msgstr "使用通知声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Nick completed character"
-msgstr "昵称补全字符"
+msgid "Whether to play a sound to notify of events."
+msgstr "是否需要事件提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Open new chats in separate windows"
-msgstr "在单独窗口中打开新聊天"
+msgid "Disable sounds when away"
+msgstr "离开时禁用声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Path of the Adium theme to use"
-msgstr "Adium 主题的路径"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "当离开或忙碌时是否使用声音提示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for new conversations"
-msgstr "新对话时播放声音"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "是否需要消息到达提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是否为外出消息使用声音提示。"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound when a contact logs in"
-msgstr "联系人登录时播放声音"
+msgid "Play a sound for new conversations"
+msgstr "新对话时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Play a sound when a contact logs out"
-msgstr "联系人注销时播放声音"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "是否需要新会话提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Play a sound when we log in"
-msgstr "登录时播放声音"
+msgid "Play a sound when a contact logs in"
+msgstr "联系人登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log out"
-msgstr "注销时播放声音"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "是否需要联系人上线提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "如果聊天窗口不是焦点则弹出消息通知"
+msgid "Play a sound when a contact logs out"
+msgstr "联系人注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications when a contact logs in"
-msgstr "当联系人登录时弹出通知"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "是否需要联系人下线提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs out"
-msgstr "当联系人注销时弹出通知"
+msgid "Play a sound when we log in"
+msgstr "登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Position the camera preview should be during a call."
-msgstr "在通话时摄像头预览的位置。"
+msgid "Whether to play a sound when logging into a network."
+msgstr "当联网登录时是否播放提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Show Balance in contact list"
-msgstr "在联系人列表中显示余额"
+msgid "Play a sound when we log out"
+msgstr "注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show avatars"
-msgstr "显示头像"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "当网络断开时是否播放提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show contact list in rooms"
-msgstr "在聊天室显示联系人列表"
+msgid "Enable popup notifications for new messages"
+msgstr "启用新消息弹出提示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show hint about closing the main window"
-msgstr "关闭主窗口时显示提示"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "当收到新消息时是否弹出显示提示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show offline contacts"
-msgstr "显示离线联系人"
+msgid "Disable popup notifications when away"
+msgstr "离开时禁用弹出提示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show protocols"
-msgstr "显示协议"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "当离开或忙碌时是否弹出显示提示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Spell checking languages"
-msgstr "拼写检查器语言"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "The default folder to save file transfers in."
-msgstr "保存传送文件的默认文件夹。"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "如果聊天窗口已开启，但不是当前窗口，接收新消息时是否弹出提示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The last directory that an avatar image was chosen from."
-msgstr "上次选取头像图片的目录。"
+msgid "Pop up notifications when a contact logs in"
+msgstr "当联系人登录时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The position for the chat window side pane"
-msgstr "聊天窗口边栏的位置"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "当联系人上线时是否显示弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "聊天窗口边栏保存的位置(像素)。"
+msgid "Pop up notifications when a contact logs out"
+msgstr "当联系人注销时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "用于在聊天窗口中显示会话的主题。"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "当联系人离线时是否显示弹出通知。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "用于在聊天窗口中显示会话的主题。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对话时是否将表情符号转换为表情图标。"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use notification sounds"
-msgstr "使用通知声音"
+msgid "Show contact list in rooms"
+msgstr "在聊天室显示联系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use theme for chat rooms"
-msgstr "为聊天室使用主题"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "是否在聊天室显示联系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "是否允许 Empathy 将用户的位置共享给联系人"
+msgid "Chat window theme"
+msgstr "聊天窗口主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "是否允许 Empathy 通过 GPS 估计位置"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "用于在聊天窗口中显示会话的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "是否允许 Empathy 通过手机网络估计位置"
+msgid "Chat window theme variant"
+msgstr "聊天窗口主题衍生"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "是否允许 Empathy 通过网络估计位置"
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "用于在聊天窗口中显示会话的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy 是否在启动时自动登入您的帐号。"
+msgid "Path of the Adium theme to use"
+msgstr "Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
+msgid "Enable WebKit Developer Tools"
+msgstr "启用 WebKit 开发工具"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "是否使用联系人的头像作为聊天窗口的图标。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Inform other users when you are typing to them"
+msgstr "告诉他人您正在输入"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "是否使用连接管理器自动断开连接或重新连接。"
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是否发送“编写中”(composing)或“暂停”(paused)的聊天状态。目前不影响“已离"
+"开”(gone)状态"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "是否对您想要作拼写检查的单词作拼写检查。"
+msgid "Use theme for chat rooms"
+msgstr "为聊天室使用主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "对话时是否将表情符号转换为表情图标。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "是否对聊天室使用主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
+msgid "Spell checking languages"
+msgstr "拼写检查器语言"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "是否需要联系人上线提示音。"
+msgid ""
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "是否需要联系人下线提示音。"
+msgid "Enable spell checker"
+msgstr "启用拼写检查器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of events."
-msgstr "是否需要事件提示音。"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "是否需要消息到达提示音。"
+msgid "Nick completed character"
+msgstr "昵称补全字符"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "是否需要新会话提示音。"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "是否为外出消息使用声音提示。"
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound when logging into a network."
-msgstr "当联网登录时是否播放提示音。"
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound when logging out of a network."
-msgstr "当网络断开时是否播放提示音。"
+msgid "Last account selected in Join Room dialog"
+msgstr "在加入聊天室对话框中最后选择的帐号"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play sound notifications when away or busy."
-msgstr "当离开或忙碌时是否使用声音提示。"
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "最后选择加入聊天室的帐号的 D-Bus 对象路径。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "当联系人离线时是否显示弹出通知。"
+msgid "Camera device"
+msgstr "相机设备"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "当联系人上线时是否显示弹出通知"
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr "如果聊天窗口已开启，但不是当前窗口，接收新消息时是否弹出提示。"
+msgid "Camera position"
+msgstr "相机位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "当收到新消息时是否弹出显示提示框。"
+msgid "Position the camera preview should be during a call."
+msgstr "在通话时摄像头预览的位置。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to show account balances in the contact list."
-msgstr "是否在联系人列表和聊天窗口中显示余额。"
+msgid "Echo cancellation support"
+msgstr "回声抑制支持"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "是否显示联系人清单中离线的联系人。"
+msgid "Show hint about closing the main window"
+msgstr "关闭主窗口时显示提示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid "Whether to show popup notifications when away or busy."
-msgstr "当离开或忙碌时是否弹出显示提示框。"
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "是否在联系人列表和聊天窗口中显示协议。"
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够发布用户的位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show the contact list in chat rooms."
-msgstr "是否在聊天室显示联系人列表。"
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "是否允许 Empathy 将用户的位置共享给联系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show the contact list in compact mode."
-msgstr "是否以紧凑模式显示联系人列表。"
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络来估计位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "是否允许 Empathy 通过网络估计位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to use the theme for chat rooms."
-msgstr "是否对聊天室使用主题。"
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机来估计位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "是否允许 Empathy 通过手机网络估计位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 能够通过 GPS 来估计位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "是否允许 Empathy 通过 GPS 估计位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy should reduce the location's accuracy"
+msgstr "降低 Emapthy 位置信息的准确度"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
-msgstr ""
-"使用何种条件来排序联系人列表。默认情况下使用值“姓名”以按联系人姓名排序。取值"
-"为“状态”时将按状态排序联系人列表。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管理消息和 VoIP 帐号"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "未指定原因"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2312
-msgid "Messaging and VoIP Accounts"
-msgstr "消息和 VoIP 帐号"
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "需要状态改变信息"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "您取消了文件传输"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "另外的参与者取消了文件的传输"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "当传输这个文件的时候发生错误"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "另外的参与者无法传输这个文件"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "文件传输完成，但该文件已损坏"
 
-#: ../libempathy/empathy-ft-handler.c:1124
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输不支持远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1180
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "所选文件是非正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1189
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "未接来电：%s"
@@ -515,450 +565,394 @@ msgstr "与 %s 通话"
 msgid "Call from %s"
 msgstr "来电：%s"
 
-#: ../libempathy/empathy-tp-file.c:258
-msgid "Socket type not supported"
-msgstr "不支持 Socket 类型"
-
-#: ../libempathy/empathy-tp-file.c:377
-msgid "No reason was specified"
-msgstr "未指定原因"
-
-#: ../libempathy/empathy-tp-file.c:380
-msgid "The change in state was requested"
-msgstr "需要状态改变信息"
-
-#: ../libempathy/empathy-tp-file.c:383
-msgid "You canceled the file transfer"
-msgstr "您取消了文件传输"
-
-#: ../libempathy/empathy-tp-file.c:386
-msgid "The other participant canceled the file transfer"
-msgstr "另外的参与者取消了文件的传输"
-
-#: ../libempathy/empathy-tp-file.c:389
-msgid "Error while trying to transfer the file"
-msgstr "当传输这个文件的时候发生错误"
-
-#: ../libempathy/empathy-tp-file.c:392
-msgid "The other participant is unable to transfer the file"
-msgstr "另外的参与者无法传输这个文件"
-
-#: ../libempathy/empathy-tp-file.c:395 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "未知原因"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "离线"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "状态已设置为离线"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
-#: ../libempathy-gtk/empathy-call-utils.c:49
-#: ../libempathy-gtk/empathy-new-message-dialog.c:82
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "验证失败"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "用户名已经被占用"
+msgstr "用户名已被占用"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "证书不被信任"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "证书已过期"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "证书尚未激活"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "证书主机名不匹配"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "证书指纹不匹配"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "证书是自签属的"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "证书错误"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密不可用"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "证书无效"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "连接被拒绝"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "连接已丢失"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "该资源已被连接至服务器"
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "该帐号已连接到服务器"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已被使用相同资源的新连接取代"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "服务器上已存在该帐号"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "服务器太忙，无法处理当前连接"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "证书已被吊销"
 
 # lainme：证书使用不安全的加密算法或是弱加密的
 # xslidian：证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "证书使用不安全的加密算法或者是弱加密的"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
 
-#: ../libempathy/empathy-utils.c:372
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "你的软件版本太旧了"
 
-#: ../libempathy/empathy-utils.c:531
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "内部错误"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:536
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:566
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒钟前"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 星期前"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月前"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "将来"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "全部帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "密码"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "服务器"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "端口"
 
-#: ../libempathy-gtk/empathy-account-widget.c:776
-#: ../libempathy-gtk/empathy-account-widget.c:828
+#: ../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:1182
-msgid "My Web Accounts"
-msgstr "我的网络帐号"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1199
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "%s 帐号通过 %s 进行了编辑。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1205
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "%s 帐号无法在 Empathy 中编辑。"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Launch My Web Accounts"
-msgstr "启动我的网络帐号"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1232
-#, c-format
-msgid "Edit %s"
-msgstr "编辑 %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1582
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "用户名："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1900
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "应用(_P)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1930
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2004
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "服务器上已存在该帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2007
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在服务器上创建新的帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2201
-msgid "Ca_ncel"
-msgstr "取消(_N)"
-
 #. 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:2479
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2505
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2509
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新建帐号"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例如：</b> 我的屏幕名称"
+#: ../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:"
+msgstr "密码(_W)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "高级"
+msgid "Screen _Name:"
+msgstr "用户名(_N)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例如：</b> 我的屏幕名称"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "密码(_W)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "记住密码"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "记住密码"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "端口(_P)："
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-base-password-dialog.c:261
-msgid "Remember password"
-msgstr "记住密码"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "用户名(_N)："
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "服务器(_S)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "您的 AIM 密码是什么？"
+#: ../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:11
+#: ../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-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "高级"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "您的 AIM 屏幕名称是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "端口(_P)："
+msgid "What is your AIM password?"
+msgstr "您的 AIM 密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "服务器(_S)："
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例如：</b>用户名"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "记住密码"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../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:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例如：</b>用户名"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "您的 GroupWise 用户名是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "您的 GroupWise 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN："
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>例如：</b>123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "字符集(_A):"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN："
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "您的 ICQ UIN 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "您的 ICQ 密码是什么？"
 
@@ -995,24 +989,28 @@ msgstr "选项"
 msgid "None"
 msgstr "无"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "网络"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "网络："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "字符集："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "服务器"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr "大多数 IRC 服务器不需要密码，如果您不确定，则不要输入密码。"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "网络："
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "昵称："
@@ -1029,48 +1027,20 @@ msgstr "退出消息："
 msgid "Real name:"
 msgstr "真名："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "服务器"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "您的 IRC 昵称是什么?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "哪个 IRC 网络?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例如：</b>user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例如：</b>user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)(_Y)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "忽略 SSL 证书错误(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "覆盖服务器设置"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "优先级(_T):"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 昵称是什么?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "资源(_U)："
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "您的 Facebook 用户名是什么？"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1082,179 +1052,203 @@ msgstr ""
 "<b>badger</b>。如果您还没有 Facebook 用户名的话，使用<a href=\"http://www."
 "facebook.com/username/\">这个页面</a> 来选择一个。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "使用旧的 SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "您的 Facebook 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "您的 Facebook 用户名是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "您的 Google ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例如：</b>user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "您的 Google 密码是什么？"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例如：</b>user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL 证书错误(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "资源(_U)："
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "需要加密(TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "使用旧的 SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "覆盖服务器设置"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "您的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "您的 Jabber 密码是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "您想要的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "您的 Jabber 密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "您想要的 Jabber 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user@hotmail.com"
 msgstr "<b>例如：</b>user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "您的 Windows Live 帐号是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "您的 Windows Live 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "电子邮件地址(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "昵称(_K):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "姓(_L)："
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "名(_F)"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "公开的名字(_P)："
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "姓(_L)："
+msgid "E-_mail address:"
+msgstr "电子邮件地址(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公开的名字(_P)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "用户名(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user@my.sip.server"
 msgstr "<b>例如：</b>user@my.sip.server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "验证用户名："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "发现绑定"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "自动发现 STUN 服务器"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此帐号拨打固定电话和手机(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "忽略 TLS 错误"
+msgid "NAT Traversal Options"
+msgstr "NAT 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "间隔(秒)"
+msgid "Proxy Options"
+msgstr "代理选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive 选项"
+msgid "Miscellaneous Options"
+msgstr "杂项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "宽松路由"
+msgid "STUN Server:"
+msgstr "STUN 服务器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "机制："
+msgid "Discover the STUN server automatically"
+msgstr "自动发现 STUN 服务器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "杂项"
+msgid "Discover Binding"
+msgstr "发现绑定"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "NAT 选项"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "服务器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "端口："
+msgid "Mechanism:"
+msgstr "机制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "代理选项"
+msgid "Interval (seconds)"
+msgstr "间隔(秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "验证用户名："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "传输："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN 服务器："
+msgid "Loose Routing"
+msgstr "宽松路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "服务器："
+msgid "Ignore TLS Errors"
+msgstr "忽略 TLS 错误"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "传输："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "用此帐户拨打固定电话和手机(_L)"
+msgid "Port:"
+msgstr "端口："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "您的 SIP 帐号密码是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "您的 SIP 登录 ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "用户名(_U)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "您的 SIP 帐号密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_D："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "忽略会议和聊天室邀请(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "聊天室列表 locale(_R)："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "您的 Yahoo! ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "您的 Yahoo! 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Yahoo I_D："
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "聊天室列表 locale(_R)："
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1292,87 +1286,87 @@ msgstr "所有文件"
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "发起呼叫时出错"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "选择的联系人不支持呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "选择的联系人离线"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "选择的联系人无效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "不支持在此会话上进行紧急呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "您信用卡余额不足以支付此次通话"
 
-#: ../libempathy-gtk/empathy-chat.c:706
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "建立私人对话失败"
 
-#: ../libempathy-gtk/empathy-chat.c:764
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "不支持在此会话上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:770
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "您不能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:971
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "%s 是无效的联系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清空当前会话的所有消息"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主题>：设定当前对话的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:1072
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室名>：加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1075
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室名>：加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1079
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <昵称> [<消息>]：打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <昵称> <消息>：打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <昵称>：在当前服务器上改变您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <动作消息>：向当前对话中发送一个动作消息"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1381,131 +1375,137 @@ msgstr ""
 "/say <消息>：发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
 "say /join 是用来加入一个新的聊天室”"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <联系人 ID>：显示一个联系人的信息"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<命令>]：显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1293
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅可用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "余额不足，无法发送消息"
 
-#: ../libempathy-gtk/empathy-chat.c:1461 ../libempathy-gtk/empathy-chat.c:1475
-#: ../libempathy-gtk/empathy-chat.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "发送消息“%s”出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1463 ../libempathy-gtk/empathy-chat.c:1480
-#: ../libempathy-gtk/empathy-chat.c:1542
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "发送消息出错：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1469
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "余额不足，无法发送消息。 <a href='%s'>充值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1509
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "做不到"
 
-#: ../libempathy-gtk/empathy-chat.c:1516
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1519
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1522
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:1525
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1528
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1532
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1599 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "话题："
 
-#: ../libempathy-gtk/empathy-chat.c:1611
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1613
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "话题被 %s 设置为：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:2126
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2194
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "添加“%s”到字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2231
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "添加“%s”到 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2301
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2319
+#: ../libempathy-gtk/empathy-chat.c:2437
 #: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "发送(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2376
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2465
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "获取最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2602
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1513,12 +1513,12 @@ msgstr "%s 已断开连接"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2609
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2612
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1526,17 +1526,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2620
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s 禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:2623
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:2627
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了聊天室"
@@ -1546,17 +1546,17 @@ msgstr "%s 离开了聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2636
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2661
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2686
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
@@ -1564,90 +1564,90 @@ msgstr "%s 现在叫做 %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:2847
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1260 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3493
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "是否保存密码?"
 
-#: ../libempathy-gtk/empathy-chat.c:3499
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:3509
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "不是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:3553
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "重试"
 
-#: ../libempathy-gtk/empathy-chat.c:3557
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密码错误，请重试："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3687
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密码保护的："
 
-#: ../libempathy-gtk/empathy-chat.c:3714
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:3902 ../src/empathy-event-manager.c:1281
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:3957
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "对话"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3962
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (短信)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "未知或无效的识别符"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "联系人屏蔽暂时不可用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "联系人屏蔽不可用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:271
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:275
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "无法屏蔽联系人"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:622
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "编辑屏蔽的联系人"
 
 #. 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:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1475
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "帐号："
 
@@ -1657,7 +1657,7 @@ msgstr "已屏蔽的联系人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:2
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "删除"
@@ -1680,121 +1680,45 @@ msgstr "打开链接(_O)"
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "编辑联系人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:338
-msgid "Personal Information"
-msgstr "个人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:439
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:508
-#: ../libempathy-gtk/empathy-individual-dialogs.c:198
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "屏蔽 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:513
-#: ../libempathy-gtk/empathy-individual-dialogs.c:253
+#: ../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 "确定要屏蔽 %s 以阻止他再次联系您吗？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:518
-#: ../libempathy-gtk/empathy-individual-dialogs.c:275
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "屏蔽(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:536
-#: ../libempathy-gtk/empathy-individual-dialogs.c:284
+#: ../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] "举报联系人滥用"
 
 #: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "以后再决定(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "_Block User"
 msgstr "屏蔽用户(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:212
-#: ../libempathy-gtk/empathy-individual-menu.c:1558
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contact…"
-msgstr "添加联系人(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:287
-msgid "_Block Contact"
-msgstr "屏蔽联系人"
-
-#. add chat button
-#: ../libempathy-gtk/empathy-contact-menu.c:316
-#: ../libempathy-gtk/empathy-individual-menu.c:789
-#: ../libempathy-gtk/empathy-new-message-dialog.c:320
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "聊天(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:348
-#: ../libempathy-gtk/empathy-individual-menu.c:881
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音频呼叫(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:381
-#: ../libempathy-gtk/empathy-individual-menu.c:926
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "视频呼叫(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:427
-#: ../libempathy-gtk/empathy-individual-menu.c:979
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "最近会话(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:449
-#: ../libempathy-gtk/empathy-individual-menu.c:1020
-msgid "Send File"
-msgstr "发送文件"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:472
-#: ../libempathy-gtk/empathy-individual-menu.c:1062
-msgid "Share My Desktop"
-msgstr "共享我的桌面"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-#: ../libempathy-gtk/empathy-individual-menu.c:1125
-msgid "Infor_mation"
-msgstr "信息(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:547
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:601
-#: ../libempathy-gtk/empathy-individual-menu.c:1316
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "邀请到此聊天室"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:632
-#: ../libempathy-gtk/empathy-individual-menu.c:1362
-msgid "_Invite to Chat Room"
-msgstr "邀请到聊天室(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "以后再决定(_L)"
 
 #. Title
 #: ../libempathy-gtk/empathy-contact-search-dialog.c:499
@@ -1821,166 +1745,170 @@ msgstr "您的自我介绍信息："
 msgid "Please let me see when you're online. Thanks!"
 msgstr "你在线时请让我知道，谢谢！"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:571
+#: ../libempathy-gtk/empathy-contact-widget.c:569
 #: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "频道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:749
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "包括 ISO 编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:751
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:753
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "省："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:755
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "城市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:757
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:759
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "邮政编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:761
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:763
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:765
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:767
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:769
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:771
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:773
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:775
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:777
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:779
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:781
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:783
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:785
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方位朝向："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:787
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:789
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:791
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "经度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-contact-widget.c:793
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:797
+#: ../libempathy-gtk/empathy-contact-widget.c:795
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:850
-#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "位置"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:867
+#: ../libempathy-gtk/empathy-contact-widget.c:865
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
+#: ../libempathy-gtk/empathy-contact-widget.c:917
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
-#: ../libempathy-gtk/empathy-individual-widget.c:901
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1057
-#: ../libempathy-gtk/empathy-individual-widget.c:959
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "无法保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1745
-#: ../libempathy-gtk/empathy-individual-menu.c:1097
-#: ../libempathy-gtk/empathy-individual-widget.c:1358
-msgid "Favorite"
-msgstr "收藏"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "个人详情"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "联系人详情"
 
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
@@ -2047,176 +1975,216 @@ msgstr "邮政"
 msgid "parcel"
 msgstr "邮件"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>位置</b>于(日期）\t"
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
+msgid "Identifier:"
+msgstr "标识符："
 
 #. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
 msgid "Alias:"
 msgstr "别名："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "客户端信息"
-
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "客户端："
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>位置</b>于(日期）\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "联系人详情"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "已发送信息请求..."
 
-#. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1503
-msgid "Identifier:"
-msgstr "标识符："
+msgid "Client Information"
+msgstr "客户端信息"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Information requested…"
-msgstr "已发送信息请求..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "客户端："
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "组"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1952
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:258
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "以下用户将被屏蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "以下用户无法被屏蔽："
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "已绑定的联系人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "选择要绑定的联系人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新联系人预览"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在左侧列表中选中的联系人将被绑定在一起。"
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "编辑联系人信息"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:148
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:312
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
-msgstr "选择要用于拨打电话的帐户"
+msgstr "选择要用于拨打电话的帐号"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:316
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
 #: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "通话"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:381
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "手机"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:383
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "办公"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:385
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "家庭"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "屏蔽联系人"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "聊天(_C)"
+
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:836
-#: ../libempathy-gtk/empathy-new-message-dialog.c:314
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "短信(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1174
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "最近会话(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "发送文件"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "共享我的桌面"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "收藏"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 未安装"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "请安装 gnome-contacts 来访问联系人详情。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
+msgid "Infor_mation"
+msgstr "信息(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1200
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "绑定联系人(_L)…"
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "邀请到此聊天室"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2362
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "邀请到聊天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "添加联系人(_A)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "删除并屏蔽(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的要删除群组“%s”吗？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2400
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "删除群组"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2455
-#: ../libempathy-gtk/empathy-individual-view.c:2672
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2532
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想要删除联系人“%s”吗？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2541
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2224,11 +2192,11 @@ msgid ""
 msgstr ""
 "您是否真正地想要删除已绑定的联系人'%s' ？ 注意这将删除所有联系已绑定的联系人"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2553
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "删除联系人"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1642
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2238,23 +2206,23 @@ msgstr[0] "已绑定联系人包含 %u 联系人"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>位置</b> 于 (日期)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "通过电话或移动设备上网"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "新建网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "选择一个 IRC 网络"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "重置_Networks列表"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "选择"
@@ -2267,308 +2235,246 @@ msgstr "新建服务器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "绑定联系人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "解除绑定(_U)..."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全分离已显示的绑定的联系人成为单独的联系人"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "绑定(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "解除已绑定的联系人 %s？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"您确定您要接触这些已绑定的联系人？这将会完全拆分已绑定的联系人为单独的联系"
-"人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "解除绑定(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:621
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "历史"
 
-#: ../libempathy-gtk/empathy-log-window.c:676
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "显示"
 
-#: ../libempathy-gtk/empathy-log-window.c:698
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "搜索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "在 %s 聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1149
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s 聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1199
-#: ../libempathy-gtk/empathy-log-window.c:1346
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y年%m月%d日 %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1288
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1294
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b>%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1370
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1377
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1385
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通话时长：%s，结束于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1719
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1723
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1738
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1826
-#: ../libempathy-gtk/empathy-log-window.c:3458
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "随时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1915
-#: ../libempathy-gtk/empathy-log-window.c:2371
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2684
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "谁"
 
-#: ../libempathy-gtk/empathy-log-window.c:2893
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3011
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文本聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3013
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "通话"
 
-#: ../libempathy-gtk/empathy-log-window.c:3018
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "来电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3019
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-log-window.c:3020
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "未接来电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "确定要删除以前的全部对话日志？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3755
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3762
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "从以下位置删除："
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">正在载入...</span>"
+msgid "_File"
+msgstr "文件(_F)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "聊天"
+#: ../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 "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "清空全部历史..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "个人信息"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "视频"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "聊天"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "视频"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "第 2 页"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:84
-#, fuzzy
-#| msgid "The specified contact is offline"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">正在载入...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
 msgid "The contact is offline"
-msgstr "选择的联系人离线"
+msgstr "联系人为离线"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:86
-#, fuzzy
-#| msgid "The specified contact is not valid"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
 msgid "The specified contact is either invalid or unknown"
-msgstr "选择的联系人无效"
+msgstr "指定的联系人无效或信息未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:88
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
 msgid "The contact does not support this kind of conversation"
 msgstr "选择的联系人不支持在该类型会话"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:90
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "所要求的功能与此协议不兼容"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:96
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
 msgid "Could not start a conversation with the given contact"
 msgstr "无法与选择的联系人发起对话"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:98
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
 msgid "You are banned from this channel"
 msgstr "您已被此频道屏蔽"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:100
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
 msgid "This channel is full"
 msgstr "频道已满"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:102
-#, fuzzy
-#| msgid "You have been invited to join %s"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
 msgid "You must be invited to join this channel"
-msgstr "您被邀请加入 %s"
+msgstr "您必须被邀请才能加入此频道"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:104
-#, fuzzy
-#| msgid "Contact disconnected"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
 msgid "Can't proceed while disconnected"
-msgstr "联系人已断开"
+msgstr "断开时无法进行"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:106
-#, fuzzy
-#| msgid "permission denied"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
 msgid "Permission denied"
-msgstr "权限不足"
+msgstr "拒绝访问"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:112
-#, fuzzy
-#| msgid "There was an error starting the call"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
 msgid "There was an error starting the conversation"
-msgstr "发起呼叫时出错"
+msgstr "发起对话时出错"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:291
-#: ../libempathy-gtk/empathy-new-call-dialog.c:203
+#: ../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 "输入一个联系人标识或电话号码："
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:334
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新建对话"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:226
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "视频呼叫(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:236
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Audio Call"
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "音频呼叫(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:246
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新建通话"
 
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:130
-#, fuzzy, c-format
-#| msgid "Authentication failed"
+#, c-format
 msgid "Authentification failed for account <b>%s</b>"
-msgstr "验证失败"
+msgstr "帐号 <b>%s</b> 验证失败"
 
 #: ../libempathy-gtk/empathy-base-password-dialog.c:224
 #: ../libempathy-gtk/empathy-password-dialog.c:134
@@ -2598,11 +2504,11 @@ msgstr "编辑自定义消息"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "点击移除自定义状态"
+msgstr "点击移除常用自定义状态"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "点击设置自定义状态"
+msgstr "点击设置常用自定义状态"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
@@ -2617,7 +2523,7 @@ msgstr "自定义消息..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新建 %s 帐号"
@@ -2627,20 +2533,20 @@ msgid "Find:"
 msgstr "查找："
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "区分大小写(_C)"
+msgid "_Previous"
+msgstr "上一页(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "未找到短语"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "下一页(_N)"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "区分大小写(_C)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "上一页(_P)"
+msgid "Phrase not found"
+msgstr "未找到短语"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,14 +2590,14 @@ msgstr "语音通话结束"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr "编辑自定义状态"
+msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "消息于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "普通"
 
@@ -2767,18 +2673,22 @@ msgid "Certificate hostname: %s"
 msgstr "证书主机名: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "继续"
+msgid "C_ontinue"
+msgstr "继续(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "不受信任的连接"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "连接不受信任。是否仍要继续?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "为将来的连接记住本次选择"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "证书详情"
 
@@ -2973,31 +2883,31 @@ msgstr "西方语言"
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:203
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "无错误信息"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:276
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "即时消息(Empathy)"
 
-#: ../src/empathy.c:433
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "启动时不自动连接"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:452
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " - Empathy 即时通讯客户端"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "联系帐号管理器出错"
 
-#: ../src/empathy.c:641
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3039,11 +2949,11 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2003\n"
@@ -3057,6 +2967,7 @@ msgstr ""
 "Tao Wei <weitao1979@gmail.com>, 2009\n"
 "Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
 "Tao Wang <dancefire@gmail.com>, 2010\n"
+"Mike Manilone <crtmike@gmail.com>, 2012\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
@@ -3067,231 +2978,105 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "导入帐号时发生错误。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "在解析帐号详情时出现错误。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "在创建帐号时出现错误。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "发生错误。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "错误信息为：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐户。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1272
-msgid "An error occurred"
-msgstr "发生错误"
-
-#: ../src/empathy-account-assistant.c:467
-msgid "What kind of chat account do you have?"
-msgstr "您已经拥有哪个类型的帐号？"
-
-#: ../src/empathy-account-assistant.c:473
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您还要设置其它聊天帐号吗？"
-
-#: ../src/empathy-account-assistant.c:479
-msgid "Enter your account details"
-msgstr "输入您的帐号详情"
-
-#: ../src/empathy-account-assistant.c:484
-msgid "What kind of chat account do you want to create?"
-msgstr "您想创建那种类型的帐号？"
-
-#: ../src/empathy-account-assistant.c:490
-msgid "Do you want to create other chat accounts?"
-msgstr "您想要创建其它的聊天帐号吗、"
-
-#: ../src/empathy-account-assistant.c:497
-msgid "Enter the details for the new account"
-msgstr "输入新帐号的详细资料"
-
-#: ../src/empathy-account-assistant.c:612
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"使用 Empathy，您可以与附近的朋友聊天，还可以与使用 Google Talk，AIM，Windows "
-"Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就可以开始音频"
-"和视频通话。"
-
-#: ../src/empathy-account-assistant.c:629
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "您有没有其它聊天软件的帐号？"
-
-#: ../src/empathy-account-assistant.c:653
-msgid "Yes, import my account details from "
-msgstr "有，请导入我的帐号信息"
-
-#: ../src/empathy-account-assistant.c:674
-msgid "Yes, I'll enter my account details now"
-msgstr "有，我现在就输入我的帐号信息"
-
-#: ../src/empathy-account-assistant.c:696
-msgid "No, I want a new account"
-msgstr "不，我想要一个新的帐号"
-
-#: ../src/empathy-account-assistant.c:706
-msgid "No, I just want to see people online nearby for now"
-msgstr "没有，我只是想看看附近现在谁在线上"
-
-#: ../src/empathy-account-assistant.c:727
-msgid "Select the accounts you want to import:"
-msgstr "选择您要导入的帐号："
-
-#: ../src/empathy-account-assistant.c:814
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:821
-msgid "No, that's all for now"
-msgstr "没有，就这样吧"
-
-#: ../src/empathy-account-assistant.c:1086
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
-"想使用这个功能，请仔细查看下列信息是否正确。您之后也可以通过“帐号”对话框轻松"
-"的修改这些信息或关闭这个功能"
-
-#: ../src/empathy-account-assistant.c:1092
-#: ../src/empathy-account-assistant.c:1148
-msgid "Edit->Accounts"
-msgstr "编辑->帐号"
-
-#: ../src/empathy-account-assistant.c:1108
-msgid "I do _not want to enable this feature for now"
-msgstr "暂不启用此特性(_N)"
-
-#: ../src/empathy-account-assistant.c:1144
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想启"
-"用该功能，请安装 telepathy-salut 包，并且在帐号对话框中创建附近的人(People "
-"Nearby)帐号"
-
-#: ../src/empathy-account-assistant.c:1150
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 未安装"
-
-#: ../src/empathy-account-assistant.c:1196
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "消息和 VoIP 帐号助手"
-
-#: ../src/empathy-account-assistant.c:1230
-msgid "Welcome to Empathy"
-msgstr "欢迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1239
-msgid "Import your existing accounts"
-msgstr "导入现有帐号"
-
-#: ../src/empathy-account-assistant.c:1257
-msgid "Please enter personal details"
-msgstr "请输入个人信息"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "您的 %s 帐号有未保存的修改。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "您的新帐号还没有保存。"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无可用网络"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"因为此账户依赖一个旧式、不支持的后端，所以此账户已被禁用。请安装 telepathy-"
+"haze 并重新启动您的会话来迁移您的账户。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "离线 - 帐号被禁用"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？"
+#: ../src/empathy-accounts-dialog.c:572
+msgid "Edit Connection Parameters"
+msgstr "编辑连接参数"
+
+#: ../src/empathy-accounts-dialog.c:735
+msgid "Failed to retrieve your personal information from the server."
+msgstr "从服务器获取您的个人信息失败。"
+
+#: ../src/empathy-accounts-dialog.c:741
+msgid "Go online to edit your personal information."
+msgstr "请上线以编辑您的个人信息。"
+
+#: ../src/empathy-accounts-dialog.c:826
+msgid "_Edit Connection Parameters..."
+msgstr "编辑连接参数(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "您要从电脑中移除 %s 吗？"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "这不会删除服务器上的帐号。"
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将要选择另一个帐号，所做的修改将作废。您确定要继续吗？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "跳过(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "连接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3301,45 +3086,37 @@ msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续
 msgid "Add…"
 msgstr "添加..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "正在加载账号信息"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安装协议"
+msgid "_Import…"
+msgstr "导入(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "协议："
+msgid "Loading account information"
+msgstr "正在加载帐号信息"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "要添加一个新帐号，您首先需要为您想要使用的每个协议安装后端。"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Import…"
-msgstr "导入(_I)..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol backends installed"
+msgstr "未安装协议后端"
 
-#: ../src/empathy-auth-client.c:284
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " - Empathy 认证客户端"
 
-#: ../src/empathy-auth-client.c:300
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Empathy 认证客户端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
@@ -3382,100 +3159,98 @@ msgstr "详细信息"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "机器所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上服务器所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "另一方所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中转服务器 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地址"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
-#, fuzzy
-#| msgid "Unknown"
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3485,257 +3260,298 @@ msgstr ""
 "Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
 "单里“调试”窗口收集到的日志。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "呼叫引擎里出现了一个故障"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已到达流的末尾"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "不能建立音频流"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "不能建立视频流"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "音频"
+msgid "_Call"
+msgstr "通话(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "解码器："
+msgid "_Microphone"
+msgstr "话筒(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "禁用相机"
+msgid "_Camera"
+msgstr "相机(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "显示拨号盘"
+msgid "_Settings"
+msgstr "设置(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "编码器："
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "查看(_V)"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "挂起"
+#: ../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 "帮助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "挂起当前呼叫"
+#: ../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 "内容(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "本地候选："
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "最大化我"
+msgid "Swap camera"
+msgstr "交换相机"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "最小化我"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "远程候选："
+msgid "Maximise me"
+msgstr "最大化我"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "发送音频"
+msgid "Disable camera"
+msgstr "禁用相机"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "发送视频"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "挂断"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "显示拨号盘"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "挂断当前呼叫"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "视频呼叫"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "开始视频通话"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "开始音频通话"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "交换相机"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "切换音频传输"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "切换视频传输"
+msgid "Show dialpad"
+msgstr "显示拨号盘"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
-msgid "Unknown"
-msgstr "未知"
+msgid "Display the dialpad"
+msgstr "显示拨号盘"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "发送视频"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "视频呼叫"
+msgid "Toggle video transmission"
+msgstr "切换视频传输"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "通话(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "发送音频"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "相机(_C)"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "内容(_C)"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "切换音频传输"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "调试(_D)"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "编码器："
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "帮助(_H)"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "解码器："
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "话筒(_M)"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "远程候选："
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "设置(_S)"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "本地候选："
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "查看(_V)"
+msgid "Audio"
+msgstr "音频"
+
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "关闭此窗口？"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "关闭此窗口将离开 %s。您将不会再收到任何消息，除非重新加入。"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"关闭此窗口将离开 %u 间聊天室。您将不会再收到任何消息，除非重新加入。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "级别 %s？"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "您将不会再收到来自此聊天室的任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "关闭窗口"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "离开聊天室"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (和另外 %u 人)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (另有他人的 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (所有人共 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "短信："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在发送 %d 条消息"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "输入消息。"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
+msgid "_Conversation"
+msgstr "对话(_C)"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "联系人(_O)"
+msgid "C_lear"
+msgstr "清除(_L)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "插入表情(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "收藏聊天室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "邀请参与者(_P)…"
+msgid "Notify for All Messages"
+msgstr "提示所有消息"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "显示联系人列表(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "右移标签(_R)"
+msgid "Invite _Participant…"
+msgstr "邀请参与者(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "提示所有消息"
+msgid "C_ontact"
+msgstr "联系人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "对话(_C)"
+msgid "_Tabs"
+msgstr "标签(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "收藏聊天室(_F)"
+msgid "_Previous Tab"
+msgstr "上一标签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "撤销关闭标签(_U)"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "显示联系人列表(_S)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "左移标签(_L)"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "标签(_T)"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "右移标签(_R)"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "撤销关闭标签(_U)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "漂移标签(_D)"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3749,100 +3565,100 @@ msgstr "聊天室"
 msgid "Auto-Connect"
 msgstr "自动连接"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "管理聊天室收藏"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "呼入的视频通话"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "来电"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 视频来电。您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 来电，您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1561
+#: ../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 "%s 的来电"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "使用视频接听(_A)"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1561
+#: ../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 "%s 的视频呼叫"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀请加入 %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:1145 ../src/empathy-main-window.c:377
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需要密码"
 
-#: ../src/empathy-event-manager.c:1210
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 当您在线的时候可见"
 
-#: ../src/empathy-event-manager.c:1214
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3852,105 +3668,105 @@ msgstr ""
 "消息：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在向 %2$s 发送 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "向 %2$s 发送 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "发送文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "已经从 %2$s 完成接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已经向 %2$s 完成发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他参与者的回应"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩余"
 
@@ -3962,174 +3778,193 @@ msgstr "文件传输"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完成、已取消及已失败的文件传输"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "导入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "未找到可导入的帐号。Empathy 目前只能支持从 Pidgin 导入帐户。"
+msgstr "未找到可导入的帐号。Empathy 目前只能支持从 Pidgin 导入帐号。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "导入帐号"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "源"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "提供密码"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "已断开连接"
 
-#: ../src/empathy-main-window.c:637
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需要设置一个帐号才能查看这里的联系人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "没有找到匹配项"
 
-#: ../src/empathy-main-window.c:745
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐户。"
+msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐号。"
 
-#: ../src/empathy-main-window.c:813
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "升级软件"
 
-#: ../src/empathy-main-window.c:819 ../src/empathy-main-window.c:940
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/empathy-main-window.c:928
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "重新连接"
 
-#: ../src/empathy-main-window.c:934
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "编辑帐号"
 
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:1073
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "给 %s 充值(%s)..."
 
-#: ../src/empathy-main-window.c:1120
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
-msgstr "帐户充值"
+msgstr "帐号充值"
 
 #. top up button
-#: ../src/empathy-main-window.c:1191
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "充值..."
 
-#: ../src/empathy-main-window.c:1934
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "联系人"
 
-#: ../src/empathy-main-window.c:2309
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需要启用一个帐号才能查看这里的联系人。"
+
+#. 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 "您需要启用 %s 来查看这里的联系人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "联系人地图(_M)"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帐号设置"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "帐户余额"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新建对话(_N)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "在联系人列表中查找(_L)"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新建呼叫(_C)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "加入已收藏的聊天室(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "搜索联系人(_S)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "管理收藏夹"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "常规视图(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "离线联系人(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "新建呼叫(_C)..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "显示协议(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "扩展视图(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "帐号余额"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "联系人地图(_M)"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "帐号(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "已屏蔽的联系人(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "首选项(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "显示协议(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "在联系人列表中查找(_L)"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "按姓名排序(_N)"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "按状态排序(_S)"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "帐号(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "扩展视图(_A)"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "已屏蔽的联系人(_B)"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "常规视图(_O)"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "文件传输(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "聊天室(_R)"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新建对话(_N)..."
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "离线联系人(_O)"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "个人信息(_P)"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "聊天室(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "加入已收藏的聊天室(_F)"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contacts…"
-msgstr "搜索联系人(_S)..."
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "管理收藏夹"
 
 #: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
@@ -4141,7 +3976,7 @@ msgstr "成员"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:623
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4154,22 +3989,27 @@ msgstr ""
 "需要密码: %s\n"
 "成员: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:625
-#: ../src/empathy-new-chatroom-dialog.c:626
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:654
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "无法开始聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.c:664
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "无法停止聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "无法载入聊天室列表"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "加入聊天室"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4177,23 +4017,23 @@ msgid ""
 msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室。"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "聊天室(_R)："
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
 msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前帐号的服务器上。"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "加入聊天室"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "无法载入聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "聊天室(_R)："
-
 #: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "收到了消息"
@@ -4207,12 +4047,12 @@ msgid "New conversation"
 msgstr "新对话"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
-msgstr "离线人上线"
+msgid "Contact comes online"
+msgstr "联系人上线了"
 
 #: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "联系人离线"
+msgstr "联系人离线了"
 
 #: ../src/empathy-preferences.c:171
 msgid "Account connected"
@@ -4227,367 +4067,390 @@ msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "朱立叶"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Deny thy father and refuse thy name;"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Or if thou wilt not, be but sworn my love"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "And I'll no longer be a Capulet."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Shall I hear more, or shall I speak at this?"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "朱立叶已断开连接"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "首选项"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "显示表情符号为图形(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "在聊天室显示联系人列表(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "外观"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "行为"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "聊天开始于："
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "聊天主题(_E)："
+msgid "new ta_bs"
+msgstr "新标签(_B)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "离开或忙碌时禁用提示(_A)"
+msgid "new _windows"
+msgstr "新窗口(_W)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "离开或忙碌时禁用声音(_A)"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "再提示区域显示呼入事件"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "启动时自动连接(_A) "
+
 #: ../src/empathy-preferences.ui.h:9
-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 "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"回声消除可以使您的语音在对方听来更清晰，但在某些计算机上可能导致问题。如果您"
-"或对方在通话时听到了奇怪的噪音或怪音，请尝试关闭回声消除并重新通话。"
+msgid "Log conversations"
+msgstr "记录对话"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "当联系人上线时允许提示"
+msgid "Behavior"
+msgstr "行为"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "当联系人离线时允许提示"
+msgid "General"
+msgstr "常规"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "当会话闲置时允许提示"
+msgid "_Enable bubble notifications"
+msgstr "允许气泡通知(_E)"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "允许拼写检查的语言："
+msgid "Disable notifications when _away or busy"
+msgstr "离开或忙碌时禁用提示(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "常规"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "当会话闲置时允许提示"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "当联系人上线时允许提示"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Location sources:"
-msgstr "位置来源："
+msgid "Enable notifications when a contact goes offline"
+msgstr "当联系人离线时允许提示"
 
 #: ../src/empathy-preferences.ui.h:17
-msgid "Log conversations"
-msgstr "记录对话"
-
-#: ../src/empathy-preferences.ui.h:18
 msgid "Notifications"
 msgstr "提示"
 
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "启用声音通知(_E)"
+
 #: ../src/empathy-preferences.ui.h:19
-msgid "Play sound for events"
-msgstr "播放事件声音"
+msgid "Disable sounds when _away or busy"
+msgstr "离开或忙碌时禁用声音(_A)"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Privacy"
-msgstr "隐私"
+msgid "Play sound for events"
+msgstr "播放事件声音"
 
 #: ../src/empathy-preferences.ui.h:21
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
-"将精确到一位小数。 "
+msgid "Sounds"
+msgstr "声音"
 
 #: ../src/empathy-preferences.ui.h:22
-msgid "Show _smileys as images"
-msgstr "显示表情符号为图形(_S)"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制，以改善通话质量"
 
 #: ../src/empathy-preferences.ui.h:23
-msgid "Show contact _list in rooms"
-msgstr "在聊天室显示联系人列表(_L)"
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Sounds"
-msgstr "声音"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Spell Checking"
-msgstr "拼写检查"
+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 "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除可以使您的语音在对方听来更清晰，但在某些计算机上可能导致问题。如果您"
+"或对方在通话时听到了奇怪的噪音或怪音，请尝试关闭回声消除并重新通话。"
 
 #: ../src/empathy-preferences.ui.h:26
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "语言列表仅反映已安装的字典"
+msgid "_Publish location to my contacts"
+msgstr "向我的联系人公布位置信息(_P)"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Themes"
-msgstr "主题"
-
-#: ../src/empathy-preferences.ui.h:28
-msgid "Use _echo cancellation to improve call quality"
-msgstr "使用回声抑制，以改善通话质量"
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
+"将精确到一位小数。 "
 
+#. 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 "Variant:"
-msgstr "版本："
+msgid "_Reduce location accuracy"
+msgstr "降低位置信息精度(_R)"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "_Automatically connect on startup"
-msgstr "启动时自动连接(_A) "
+msgid "Privacy"
+msgstr "隐私"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Cellphone"
-msgstr "手机(_C)"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
-msgid "_Enable bubble notifications"
-msgstr "允许气泡通知(_E)"
+msgid "_Cellphone"
+msgstr "手机(_C)"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable sound notifications"
-msgstr "启用声音通知(_E)"
-
-#: ../src/empathy-preferences.ui.h:34
-msgid "_GPS"
-msgstr "_GPS"
-
-#: ../src/empathy-preferences.ui.h:35
 msgid "_Network (IP, Wi-Fi)"
 msgstr "网络(_N)(IP，Wi-Fi)"
 
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "位置来源："
+
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在单独窗口中打开新聊天(_O)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "语言列表仅反映已安装的字典"
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Publish location to my contacts"
-msgstr "向我的联系人公布位置信息(_P)"
+msgid "Enable spell checking for languages:"
+msgstr "允许拼写检查的语言："
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "拼写检查"
 
-#. 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:39
-msgid "_Reduce location accuracy"
-msgstr "降低位置信息精度(_R)"
+msgid "Chat Th_eme:"
+msgstr "聊天主题(_E)："
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "版本："
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "主题"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "状态"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "再次呼叫联系人"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "相机关闭"
+msgid "Redial"
+msgstr "重拨"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "相机开启"
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "视频关闭"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "禁用相机停止发送视频"
+msgid "Video Preview"
+msgstr "视频预览"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "启用相机，并发送视频"
+msgid "Video On"
+msgstr "视频开启"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "启用相机，但不发送视频"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "再次呼叫联系人"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "预览"
+msgid "Camera Off"
+msgstr "相机关闭"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "重拨"
+msgid "Disable camera and stop sending video"
+msgstr "禁用相机停止发送视频"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "视频(_I)"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "预览"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "视频关闭"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "启用相机，但不发送视频"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "视频开启"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "相机开启"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "视频预览"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "启用相机，并发送视频"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "联系地图视图"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "保存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 链接"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 响应"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "一次粘贴的数据太多。请把日志保存到文件。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "发送到 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "调试"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "信息"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "消息"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "危急"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "错误"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "已选定的连接管理不支持远程调试扩展"
 
-#: ../src/empathy-invite-participant-dialog.c:197
-#: ../src/empathy-invite-participant-dialog.c:225
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "邀请参与者"
 
-#: ../src/empathy-invite-participant-dialog.c:198
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个联系人以加入该会话："
 
-#: ../src/empathy-invite-participant-dialog.c:221
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "邀请"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "只有“附近的人”帐号的时候不显示任何对话框"
 
 # lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<帐号 ID>"
 
-#: ../src/empathy-accounts.c:196
-#, fuzzy
-#| msgid "Show the accounts dialog"
-msgid "Show account assistant"
-msgstr "显示帐号对话框"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帐号"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy 帐号"
 
@@ -4603,85 +4466,85 @@ msgstr "- Empathy 调试器"
 msgid "Empathy Debugger"
 msgstr "Empathy 调试器"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr " - Empathy IM 客户端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "响应"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接听"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以视频应答"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接受"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "提供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "静音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您当前的余额为 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "对不起，您信用卡余额不足以支付此次通话。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "充值"
 
@@ -4689,6 +4552,226 @@ msgstr "充值"
 msgid "_Match case"
 msgstr "区分大小写(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "您已经拥有哪个类型的帐号？"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "添加新帐号"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../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."
+msgstr ""
+"Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
+"想使用这个功能，请仔细查看下列信息是否正确。"
+
+#: ../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 ""
+"您可以在以后修改这些详细信息或通过在联系人列表中选择<span style=\"italic\">编"
+"辑 → 帐号</span>来禁用这一功能。"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "导入帐号时发生错误。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "在解析帐号详情时出现错误。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "在创建帐号时出现错误。"
+
+#~ msgid "There was an error."
+#~ msgstr "发生错误。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "错误信息为：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐"
+#~ "号。"
+
+#~ msgid "An error occurred"
+#~ msgstr "发生错误"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您还要设置其它聊天帐号吗？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "输入您的帐号详情"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想创建那种类型的帐号？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "您想要创建其它的聊天帐号吗、"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "输入新帐号的详细资料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy，您可以与附近的朋友聊天，还可以与使用 Google Talk，AIM，"
+#~ "Windows Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就"
+#~ "可以开始音频和视频通话。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您有没有其它聊天软件的帐号？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "有，请导入我的帐号信息"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "有，我现在就输入我的帐号信息"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "不，我想要一个新的帐号"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "没有，我只是想看看附近现在谁在线上"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "选择您要导入的帐号："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "没有，就这样吧"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "编辑->帐号"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "暂不启用此特性(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想"
+#~ "启用该功能，请安装 telepathy-salut 包，并且在帐号对话框中创建附近的人"
+#~ "(People Nearby)帐号"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut 未安装"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "消息和 VoIP 帐号助手"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "欢迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "导入现有帐号"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "请输入个人信息"
+
+#~ msgid "Protocol:"
+#~ msgstr "协议："
+
+#~ msgid "Show account assistant"
+#~ msgstr "显示帐号助手"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "不支持 Socket 类型"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的网络帐号"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s 帐号通过 %s 进行了编辑。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s 帐号无法在 Empathy 中编辑。"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "启动我的网络帐号"
+
+#~ msgid "Edit %s"
+#~ msgstr "编辑 %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "取消(_N)"
+
+#~ msgid "Personal Information"
+#~ msgstr "个人信息"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "已绑定的联系人"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "选择要绑定的联系人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新联系人预览"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在左侧列表中选中的联系人将被绑定在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "绑定联系人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "绑定联系人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "解除绑定(_U)..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全分离已显示的绑定的联系人成为单独的联系人"
+
+#~ msgid "_Link"
+#~ msgstr "绑定(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "解除已绑定的联系人 %s？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您确定您要接触这些已绑定的联系人？这将会完全拆分已绑定的联系人为单独的联系"
+#~ "人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "解除绑定(_U)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？"
+
+#~ msgid "_Personal Information"
+#~ msgstr "个人信息(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在单独窗口中打开新聊天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "来电音量"
 
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 12ebb28c5..a983aded5 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-14 20:22+0800\n"
-"PO-Revision-Date: 2012-01-14 20:23+0800\n"
+"POT-Creation-Date: 2012-03-05 21:23+0800\n"
+"PO-Revision-Date: 2012-03-05 21:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "Language: zh_TW\n"
@@ -35,6 +35,16 @@ msgstr "Empathy 互聯網通訊"
 msgid "IM Client"
 msgstr "即時通用戶端"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理訊息與 VoIP 帳號"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "訊息與 VoIP 帳號"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
@@ -169,303 +179,311 @@ msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "當你正輸入訊息給其他使用者時通知他們"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "上次在「參加聊天室」對話盒選取的帳號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "網名補齊字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "要使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "當聯絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "當有聯絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "當聯絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "當聯絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "通話時攝影機預覽應該擺放的位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "於聯絡人清單內顯示餘額"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "顯示聯絡人羣組"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "在聊天室顯示聯絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "顯示離線聯絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "顯示協定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "聊天視窗側窗格的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在聊天視窗顯示談話的佈景主題樣式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是否要將使用者的位置發布給他的聯絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是否使用 GPS 來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是否使用流動電話網絡來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是否使用網絡來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否應在啟動時自動登入你的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是否基於私隱的理由減低位置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是否使用聯絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用連線管理程式自動斷線或重新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否以你設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是否將談話中的表情符號轉換為圖片形式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是否要啟用 Pulseaudio 的回音消除過濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否播放音效來通知有聯絡人登入網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否播放音效來通知有聯絡人登出網絡。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否播放音效來通知有收到訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否播放音效來通知有送出訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入某網絡時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出某網絡時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr "是否要傳送「撰寫中」或「已中止」的聊天狀態。若目前是「已離開」狀態則不受影響。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當聯絡人離線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當聯絡人上線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊息時是否顯示彈出式通知 (即使已開啟聊天視窗，但沒有獲得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "是否要在聯絡人清單內顯示帳戶餘額。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在聯絡人清單與聊天視窗顯示聯絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否在聯絡人清單中顯示離線的聯絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "是否要在聯絡人清單內顯示羣組。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室中顯示聯絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "是否以精簡模式顯示聯絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否為聊天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
-msgstr "排序聯絡人清單時要使用哪個準則。預設值是使用聯絡人的名稱「name」(名稱) 值來排序。而「state」(狀態) 值則會使用其狀態來排序聯絡人清單。"
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管理訊息與 VoIP 帳號"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "訊息與 VoIP 帳號"
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr "排序聯絡人清單時要使用哪個準則。預設值是使用聯絡人的狀態「state」(狀態) 值來排序。而「name」(名稱) 值則會根據據名稱來排序聯絡人清單。"
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -491,7 +509,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的參與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "不明原因"
 
@@ -511,7 +529,7 @@ msgstr "選取的檔案不是正規的檔案"
 msgid "The selected file is empty"
 msgstr "選取的檔案是空白的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "漏接 %s 的來電"
@@ -527,208 +545,212 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "網絡錯誤"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "沒有提供證書"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "證書不被信任"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "證書已逾期"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "證書尚未使用"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "證書主機名稱不符"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "證書指紋檔不符"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "證書為自我簽署"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "證書錯誤"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "證書無效"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "連線遭拒"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "此資源已連接至該伺服器"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "這個帳號已連接至伺服器"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相同資源的新連線取代"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺服器上"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺服器目前過於忙碌以致於無法處理該連線"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "已撤銷證書"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "證書使用不安全的密碼演算法，或是密碼處理上較弱"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺服器證書的長度，或是伺服器證書鏈的深度超過密碼函式庫所能處理的範圍"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "你的軟件過舊"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "內部錯誤"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週前"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "所有帳號"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "帳號"
 
@@ -746,30 +768,30 @@ msgstr "伺服器"
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者名稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺服器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在這個伺服器上建立新的帳號"
 
@@ -778,19 +800,19 @@ msgstr "在這個伺服器上建立新的帳號"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新增帳號"
 
@@ -1241,217 +1263,223 @@ msgstr "所有檔案"
 msgid "Click to enlarge"
 msgstr "請按這裏放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "啟動通話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "指定的聯絡人不支援通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "指定的聯絡人已經離線"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "指定的聯絡人無效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此協定不支援緊急通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "你的存額不足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "開啟私人聊天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題不被支援"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "你不被允許更改這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "「%s」不是有效的聯絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目前談話的所有訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目前談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<聊天室 ID>] [<原因>]：離開聊天室，預設為目前的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <聯絡人 ID> <訊息>：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <網名>：更改在目前伺服器上的你的網名"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來說：「/say /join 是用來參加新的聊天室」"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <聯絡人 ID>：顯示聯絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請參見 /help 以取得可用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "餘額不足以傳送訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳送訊息時發生錯誤：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘額不足以傳送訊息。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "無效的聯絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s 將主題設定為：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s」至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "無法取得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1459,12 +1487,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1472,17 +1500,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
@@ -1492,17 +1520,17 @@ msgstr "%s 已經離開此聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經參加此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 現在被稱為 %s"
@@ -1510,55 +1538,55 @@ msgstr "%s 現在被稱為 %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "你想要儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "記住"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "現在不要"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "重試"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請再試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "此聊天室已被密碼保護："
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "參加"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1603,7 +1631,7 @@ msgstr "被封鎖的聯絡人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "移除"
@@ -1626,33 +1654,29 @@ msgstr "開啟連結(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "個人資料"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增聯絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "封鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 "你確定想要封鎖「%s」讓他無法再與你聯絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1850,6 +1874,16 @@ msgstr "儲存大頭貼"
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "個人細節"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "聯絡人詳細資料"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "全名"
@@ -1933,11 +1967,6 @@ msgstr "用戶端資訊"
 msgid "Client:"
 msgstr "用戶端："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "聯絡人詳細資料"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1958,27 +1987,27 @@ msgstr "OS："
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "羣組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "請選擇這個聯絡人要顯現在哪個羣組。注意你可以選擇一個以上的羣組或不選擇羣組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "加入羣組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "選取"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "羣組"
 
@@ -1996,163 +2025,147 @@ msgstr[0] "下列識別身分無法被封鎖："
 msgid "Edit Contact Information"
 msgstr "編輯聯絡人資訊"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "連結聯絡羣"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "選取要連結的聯絡人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新增聯絡人預覽"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在清單左方的所選聯絡人將連結在一起。"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "選取要用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "流動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "住家"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "封鎖聯絡人(_B)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "聊天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視像通話(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "過往談話(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "分享我的桌面"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "喜好"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 尚未安裝"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "請安裝 gnome-contacts 來存取聯絡人細節。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "連結聯絡人(_L)…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "邀請你到這個聊天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "邀請到聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "加入聯絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "刪除並封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是否想要移除羣組「%s」？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "正在移除羣組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是否想要移除聯絡人「%s」？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, 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 "你真的想要移除連結聯絡人「%s」嗎？請注意這會移除所有構成此連結聯絡羣的聯絡人。"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "正在移除聯絡人"
 
@@ -2195,174 +2208,133 @@ msgstr "新增伺服器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "連結聯絡人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "取消連結(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全將顯示的連結聯絡羣分散為獨立的聯絡人。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "連結(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "要取消連結聯絡人「%s」的連結嗎？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr "你確定要取消這些連結聯絡羣的連結？這會完全將連結聯絡羣分散為獨立的聯絡人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "取消連結(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "歷史"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "搜尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s 聊天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分鐘"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，結束於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y年%B%e日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文字聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "漏接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "你確定要刪除過往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2448,7 +2420,7 @@ msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入聯絡人辨識身份或電話號碼："
 
@@ -2458,17 +2430,17 @@ msgid "New Conversation"
 msgstr "新增談話"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "視像通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新增通話"
 
@@ -2524,7 +2496,7 @@ msgstr "自選訊息…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
@@ -2593,12 +2565,12 @@ msgstr "語音通話結束"
 msgid "Edit Custom Messages"
 msgstr "編輯自選訊息"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊息編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "一般"
 
@@ -2674,41 +2646,45 @@ msgid "Certificate hostname: %s"
 msgstr "證書主機名稱：%s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "繼續"
+msgid "C_ontinue"
+msgstr "繼續(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "未受信任的連線"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "此連線未受信任。你無論如何都要繼續嗎？"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "請記住此選擇以供未來連線使用"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "證書詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "空間不足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需要 %s 的空間以儲存此檔案，但僅有 %s 可用。請選擇其他位置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2888,23 +2864,23 @@ msgstr "沒有錯誤訊息"
 msgid "Instant Message (Empathy)"
 msgstr "即時通訊 (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時不顯示聯絡人清單或任何其他對話窗"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通用戶端"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "聯絡帳號管理程式時發生錯誤"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2955,217 +2931,80 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "匯入帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "解析帳號詳細資料時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "建立帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "有錯誤發生。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "錯誤訊息為：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr "你可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入帳號。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "發生錯誤"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "你的聊天帳號是哪一種？"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "你還想要設定其他的聊天帳號嗎？"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "請輸入你的帳號詳細資料"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "你想要建立何種聊天帳號？"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "是否想要建立其他聊天帳號？"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "請輸入新帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr "使用 Empathy 可以在網上跟附近的人聊天，或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。"
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "你是否有使用其他聊天程式的帳號？"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "是的，請匯入我的帳號詳細資料於"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "是的，我現在要輸入帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "不，我想要新的帳號"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "不，我現在只想看看附近有誰上線"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "選擇要匯入的帳號："
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "不，目前就這樣"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr "Empathy 可以自動探索與你連線到相同網絡上的人們，並且和他們聊天。如果你想要使用此功能，請檢查下列詳細資料是否正確。你也可以在以後簡單地更改這些細節，或是用「帳號」對話窗來停用此功能"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "編輯 -> 帳號"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "我現在不想要啟用這項功能(_N)"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr "你無法與連線到你本機網絡的人們聊天，因為 telepathy-salut 尚未安裝。如果你想要啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳號"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 尚未安裝"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "訊息與 VoIP 帳號助理"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "歡迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "匯入現有的帳號"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "請輸入個人詳細資料"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與你的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存你的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網絡連線"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr "這個帳已經停用，因為它需要老舊、不再受支援的後端程式。請安裝 telepathy-haze 並重新啟動你的作業階段來遷移帳號資料。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已停用"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "編輯連線參數"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "無法從伺服器擷取你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "上線以編輯你的個人資料。"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "編輯連線參數(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是否想要從你的電腦上移除羣組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "這不會移除伺服器上的你的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3174,15 +3013,23 @@ msgstr ""
 "你所做的更改。確定要繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "略過(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "連接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3199,20 +3046,16 @@ msgid "Loading account information"
 msgstr "正在載入帳號資訊"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安裝通訊協定"
+msgid "No protocol backends installed"
+msgstr "尚未安裝通訊協定後端程式"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "協定："
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "要加入新的帳號，你必須先安裝每個會用到的通訊協定後端程式。"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "匯入(_I)…"
 
@@ -3224,15 +3067,11 @@ msgstr "- Empathy 認證用戶端"
 msgid "Empathy authentication client"
 msgstr "Empathy 認證用戶端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音訊視像用戶端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視像用戶端"
 
@@ -3275,98 +3114,98 @@ msgstr "詳細資料"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "互聯網上的伺服器看見的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中繼伺服器的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多點廣播羣組的 IP 位址"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟件不瞭解任何你電腦上所支援的音訊格式"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟件不瞭解任何你電腦上所支援的視像格式"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。你們其中之一可能在一個不允許直接連線的網絡之上。"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "這個網絡上有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的音訊格式尚未在你的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的視像格式尚未在你的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3374,23 +3213,23 @@ msgid ""
 "the Help menu."
 msgstr "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">匯報這個錯誤</a>並附上從求助選單內的「除錯」視窗中所收集的紀錄。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已達串流末端"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串流"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "無法建立視像串流"
 
@@ -3481,8 +3320,8 @@ msgstr "切換視像傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "不明"
 
@@ -3523,46 +3362,86 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "要關閉這個視窗？"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "關閉此視窗會離開 %s。你將無法接收到之後的訊息，除非你再次參與。"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] "關閉此視窗會離開 %u 個聊天室。你將無法接收到之後的訊息，除非你再次參與。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "離開 %s？"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "你將無法接收到此聊天室之後的訊息，除非你再次參與。"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "關閉視窗"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "離開聊天室"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳送 %d 個訊息"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "正在輸入訊息。"
 
@@ -3642,96 +3521,96 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "傳入的視像通話"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 要與你進行視像通話。你是否要接聽？"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 要與你進行通話。你是否要接聽？"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "%s 的來電"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "以視像接聽(_A)"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "來自 %s 的視像通話"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "聊天室邀請"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請你參加 %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "參加(_J)"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請你參加 %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "你被邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需要密碼"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想要得到查看你是否上線的許可"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3851,86 +3730,108 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完成、已取消和失敗的檔案傳輸"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "匯入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找不到可匯入的帳號。Empathy 目前只支援從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "來源"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "提供密碼"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "你需要設置一個帳號才能在這裏查看聯絡人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "找不到符合項目"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，%s 帳號無法使用，除非你的 %s 軟件已更新。"
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "更新軟件..."
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "重新連接"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "加值帳號存額"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "聯絡人"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "你需要啟用你其中之一的帳號之才能在這裏查看聯絡人。"
+
+#. 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 "你需要啟用 %s 才能在這裏查看聯絡人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "聯絡人清單"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帳號設定值"
+
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "聯絡人地圖(_M)"
@@ -4009,15 +3910,11 @@ msgstr "新增談話(_N)…"
 msgid "_Offline Contacts"
 msgstr "離線聯絡人(_O)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人資料(_P)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "搜尋聯絡人(_S)…"
 
@@ -4046,6 +3943,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
@@ -4097,7 +3999,7 @@ msgid "New conversation"
 msgstr "新增談話"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "聯絡人上線"
 
 #: ../src/empathy-preferences.c:170
@@ -4117,46 +4019,46 @@ msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "祝英台"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "梁山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與蝴蝶墜，為何不能夫妻配？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是聘媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事成虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，意難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生不相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "祝英台已斷線"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -4256,51 +4158,51 @@ msgid "Spell Checking"
 msgstr "拼字檢查"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "開啟聊天於："
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裏的語言清單只反映出你已經安裝字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話品質(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣式："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網絡 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在個別視窗開啟新的聊天(_O)"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "對我的聯絡人公開位置(_P)"
@@ -4310,6 +4212,14 @@ msgstr "對我的聯絡人公開位置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "降低位置準確度(_R)"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "新視窗(_W)"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "新分頁(_B)"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
@@ -4370,63 +4280,84 @@ msgstr "視像預覽"
 msgid "Contact Map View"
 msgstr "聯絡人地圖檢視"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 連結"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 回應"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "對於單一貼上來說資料量過大。請儲存紀錄至檔案。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "偵錯視窗"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "傳送至 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "偵錯"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "訊息"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "嚴重"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4445,32 +4376,28 @@ msgstr "選擇想要邀請進入談話的聯絡人："
 msgid "Invite"
 msgstr "邀請"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "不要顯示任何對話窗；執行任何作業 (例：匯入) 並離開"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "不要顯示任何對話窗，除非只有「附近的人」帳號"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "顯示帳號助理"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy 帳號"
 
@@ -4486,85 +4413,85 @@ msgstr "- Empathy 除錯器"
 msgid "Empathy Debugger"
 msgstr "Empathy 除錯程式"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy 聊天用戶端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "回應"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接聽"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以視像接聽"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接受"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "提供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 剛剛播打給你，但你正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "保留"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "靜音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "你目前的餘額為 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，你的存額不足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "加值"
 
@@ -4572,10 +4499,188 @@ msgstr "加值"
 msgid "_Match case"
 msgstr "比對大小寫(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "你的聊天帳號是哪一種？"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "新增帳號"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../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."
+msgstr "Empathy 可以自動探索與你一同連線到相同網絡上的人們，並且和他們聊天。如果你想使用此功能，請檢查下列詳細資料是否正確。"
+
+#: ../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 "你可以稍候更改這些細節，或藉由選擇「聯絡人清單」中的 <span style=\"italic\">編輯 → 帳號</span> 停用這個功能。"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "連結聯絡群"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "選取要連結的連絡人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新增連絡人預覽"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在清單左方的所選聯絡人將連結在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "連結聯絡人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "連結聯絡人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "取消連結(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全將顯示的連結聯絡群分散為獨立的聯絡人。"
+
+#~ msgid "_Link"
+#~ msgstr "連結(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "要取消連結聯絡人「%s」的連結嗎？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您確定要取消這些連結聯絡群的連結？這會完全將連結聯絡群分散為獨立的聯絡人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "取消連結(_U)"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "匯入帳號時發生錯誤。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "解析帳號詳細資料時發生錯誤。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "建立帳號時發生錯誤。"
+
+#~ msgid "There was an error."
+#~ msgstr "有錯誤發生。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "錯誤訊息為：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入"
+#~ "帳號。"
+
+#~ msgid "An error occurred"
+#~ msgstr "發生錯誤"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您還想要設定其他的聊天帳號嗎？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "請輸入您的帳號詳細資料"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想要建立何種聊天帳號？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "是否想要建立其他聊天帳號？"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "請輸入新帳號的詳細資料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy 可以在線上跟附近的人聊天，或是和使用 Google Talk、AIM、"
+#~ "Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以"
+#~ "進行語音或視訊通話。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您是否有使用其他聊天程式的帳號？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "是的，請匯入我的帳號詳細資料於"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "是的，我現在要輸入帳號的詳細資料"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "不，我想要新的帳號"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "不，我現在只想看看附近有誰上線"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "選擇要匯入的帳號："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "不，目前就這樣"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "編輯 -> 帳號"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "我現在不想要啟用這項功能(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您無法與連線到您本機網路的人們聊天，因為 telepathy-salut 尚未安裝。如果您"
+#~ "想要啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近"
+#~ "的人」帳號"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "訊息與 VoIP 帳號助理"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "歡迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "匯入現有的帳號"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "請輸入個人詳細資料"
+
+#~ msgid "Protocol:"
+#~ msgstr "協定："
+
+#~ msgid "Show account assistant"
+#~ msgstr "顯示帳號助理"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人資訊"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人資訊(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在個別視窗開啟新的聊天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "通話音量"
 
@@ -4839,8 +4944,5 @@ msgstr "新增帳號"
 #~ msgid "Hidden"
 #~ msgstr "隱藏"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "連接不上要求的使用者"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>位置</b>"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 45ccd3b39..be634e497 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: empathy 3.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-14 20:22+0800\n"
-"PO-Revision-Date: 2012-01-14 00:38+0800\n"
+"POT-Creation-Date: 2012-03-05 21:23+0800\n"
+"PO-Revision-Date: 2012-03-05 19:23+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "Language: zh_TW\n"
@@ -35,6 +35,16 @@ msgstr "Empathy 網際網路通訊"
 msgid "IM Client"
 msgstr "即時通用戶端"
 
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理訊息與 VoIP 帳號"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "訊息與 VoIP 帳號"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
@@ -169,305 +179,315 @@ msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Inform other users when you are typing to them"
+msgstr "當您正輸入訊息給其他使用者時通知他們"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Last account selected in Join Room dialog"
 msgstr "上次在「參加聊天室」對話盒選取的帳號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Path of the Adium theme to use"
 msgstr "要使用的 Adium 佈景主題路徑"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Pop up notifications when a contact logs in"
 msgstr "當連絡人登入時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "Pop up notifications when a contact logs out"
 msgstr "當連絡人登出時彈出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Position the camera preview should be during a call."
 msgstr "通話時攝影機預覽應該擺放的位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "Show Balance in contact list"
 msgstr "於聯絡人清單內顯示餘額"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Show contact groups"
+msgstr "顯示連絡人群組"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Show contact list in rooms"
 msgstr "在聊天室顯示連絡人清單"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Show protocols"
 msgstr "顯示協定"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "The position for the chat window side pane"
 msgstr "聊天視窗側窗格的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗中談話的佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用來在聊天視窗顯示談話的佈景主題樣式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是否要將使用者的位置發布給他的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是否使用 GPS 來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是否使用行動電話網路來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是否使用網路來推測位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是否基於隱私的理由減低位置的準確度。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用連線管理程式自動斷線或重新連線。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是否將談話中的表情符號轉換為圖片形式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是否要啟用 Pulseaudio 的回音消除過濾器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否播放音效來通知有連絡人登入網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否播放音效來通知有連絡人登出網路。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid "Whether to play a sound to notify of events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否播放音效來通知有收到訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否播放音效來通知新的談話。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否播放音效來通知有送出訊息。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入某網路時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出某網路時是否播放音效。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是否要傳送「撰寫中」或「已中止」的聊天狀態。若目前是「已離開」狀態則不受影"
+"響。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當連絡人離線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當連絡人上線時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊息時是否顯示彈出式通知 (即使已開啟聊天視窗，但沒有獲得焦點)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid "Whether to show account balances in the contact list."
 msgstr "是否要在聯絡人清單內顯示帳戶餘額。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Whether to show groups in the contact list."
+msgstr "是否要在聯絡人清單內顯示群組。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室中顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
 msgid "Whether to show the contact list in compact mode."
 msgstr "是否以精簡模式顯示連絡人清單。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否為聊天室使用佈景主題。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
 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."
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
 msgstr ""
-"排序連絡人清單時要使用哪個準則。預設值是使用連絡人的名稱「name」(名稱) 值來排"
-"序。而「state」(狀態) 值則會使用其狀態來排序連絡人清單。"
-
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管理訊息與 VoIP 帳號"
-
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2406
-msgid "Messaging and VoIP Accounts"
-msgstr "訊息與 VoIP 帳號"
+"排序連絡人清單時要使用哪個準則。預設值是使用連絡人的狀態「state」(狀態) 值來"
+"排序。而「name」(名稱) 值則會依據名稱來排序連絡人清單。"
 
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
@@ -493,7 +513,7 @@ msgstr "嘗試傳輸檔案時發生錯誤"
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的參與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "不明原因"
 
@@ -513,7 +533,7 @@ msgstr "選取的檔案不是正規的檔案"
 msgid "The selected file is empty"
 msgstr "選取的檔案是空白的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "漏接 %s 的來電"
@@ -529,208 +549,212 @@ msgstr "已播打 %s"
 msgid "Call from %s"
 msgstr "%s 的來電"
 
-#: ../libempathy/empathy-utils.c:231
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:236
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "離線"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:283
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:285 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:321
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../libempathy/empathy-utils.c:295 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "沒有提供憑證"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "憑證不被信任"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機名稱不符"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔不符"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "加密無法使用"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "憑證無效"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "連線遭拒"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "無法建立連線"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "已失去連線"
 
-#: ../libempathy/empathy-utils.c:353
-msgid "This resource is already connected to the server"
-msgstr "此資源已連接至該伺服器"
-
 #: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "這個帳號已連接至伺服器"
+
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "連線已被使用相同資源的新連線取代"
 
-#: ../libempathy/empathy-utils.c:358
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "該帳號已經存在於伺服器上"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "伺服器目前過於忙碌以致於無法處理該連線"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "已撤銷憑證"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "憑證使用不安全的密碼演算法，或是密碼處理上較弱"
 
-#: ../libempathy/empathy-utils.c:367
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺服器憑證的長度，或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍"
 
-#: ../libempathy/empathy-utils.c:371
+#: ../libempathy/empathy-utils.c:373
 msgid "Your software is too old"
 msgstr "您的軟體過舊"
 
-#: ../libempathy/empathy-utils.c:530
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "內部錯誤"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:535
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:565
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分鐘以前"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小時以前"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 週前"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 個月以前"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:688
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "所有帳號"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "帳號"
 
@@ -748,30 +772,30 @@ msgstr "伺服器"
 msgid "Port"
 msgstr "連接埠"
 
-#: ../libempathy-gtk/empathy-account-widget.c:763
-#: ../libempathy-gtk/empathy-account-widget.c:815
+#: ../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:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1398
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Username:"
 msgstr "使用者名稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1708
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "套用(_A)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1737
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1810
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺服器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1814
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "在這個伺服器上建立新的帳號"
 
@@ -780,19 +804,19 @@ msgstr "在這個伺服器上建立新的帳號"
 #. * 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:2239
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 上的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2265
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2269
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "新增帳號"
 
@@ -1244,87 +1268,87 @@ msgstr "所有檔案"
 msgid "Click to enlarge"
 msgstr "請按這裡放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "啟動通話時發生錯誤"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "指定的聯絡人不支援通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "指定的聯絡人已經離線"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "指定的聯絡人無效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "此協定不支援緊急通話功能"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "您的存額不足以買下該通話。"
 
-#: ../libempathy-gtk/empathy-chat.c:705
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "開啟私人聊天失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:763
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題不被支援"
 
-#: ../libempathy-gtk/empathy-chat.c:769
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "您不被允許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:991
 #, c-format
 msgid "“%s” is not a valid contact ID"
 msgstr "「%s」不是有效的連絡人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1065
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清除目前談話的所有訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1068
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>：設置目前談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1071
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1074
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室 ID>：參加新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1078
+#: ../libempathy-gtk/empathy-chat.c:1099
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/part [<聊天室 ID>] [<原因>]：離開聊天室，預設為目前的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1082
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <聯絡人 ID> <訊息>：開啟私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>：變更在目前伺服器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
@@ -1333,11 +1357,11 @@ msgstr ""
 "/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
 "說：「/say /join 是用來參加新的聊天室」"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1120
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <聯絡人 ID>：顯示聯絡人的相關資訊"
 
-#: ../libempathy-gtk/empathy-chat.c:1102
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1345,120 +1369,126 @@ msgstr ""
 "/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1166
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1292
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請參見 /help 以取得可用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1456
+#: ../libempathy-gtk/empathy-chat.c:1564
 msgid "insufficient balance to send message"
 msgstr "餘額不足以傳送訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1460 ../libempathy-gtk/empathy-chat.c:1474
-#: ../libempathy-gtk/empathy-chat.c:1537
+#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
+#: ../libempathy-gtk/empathy-chat.c:1645
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1462 ../libempathy-gtk/empathy-chat.c:1479
-#: ../libempathy-gtk/empathy-chat.c:1541
+#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
+#: ../libempathy-gtk/empathy-chat.c:1649
 #, c-format
 msgid "Error sending message: %s"
 msgstr "傳送訊息時發生錯誤：%s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1468
+#: ../libempathy-gtk/empathy-chat.c:1576
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "餘額不足以傳送訊息。<a href='%s'>加值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1508
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "not capable"
 msgstr "無法"
 
-#: ../libempathy-gtk/empathy-chat.c:1515
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1518
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1521
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1527
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1531
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:1598 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "主題："
 
-#: ../libempathy-gtk/empathy-chat.c:1610
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1612
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "%s 將主題設定為：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1728
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2193
+#: ../libempathy-gtk/empathy-chat.c:2312
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "加入「%s」至字典"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2230
+#: ../libempathy-gtk/empathy-chat.c:2349
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "加入「%s」至 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2300
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2318
-#: ../libempathy-gtk/empathy-ui-utils.c:1868
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "傳送(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2375
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2464
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "無法取得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:2601
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1466,12 +1496,12 @@ msgstr "%s 已斷線"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2608
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:2611
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1479,17 +1509,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2619
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2622
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:2626
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
@@ -1499,17 +1529,17 @@ msgstr "%s 已經離開此聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2635
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2660
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經參加此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2685
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 現在被稱為 %s"
@@ -1517,55 +1547,55 @@ msgstr "%s 現在被稱為 %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:2846
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
-#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2993
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已斷線"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3657
 msgid "Would you like to store this password?"
 msgstr "您想要儲存此密碼？"
 
-#: ../libempathy-gtk/empathy-chat.c:3498
+#: ../libempathy-gtk/empathy-chat.c:3663
 msgid "Remember"
 msgstr "記住"
 
-#: ../libempathy-gtk/empathy-chat.c:3508
+#: ../libempathy-gtk/empathy-chat.c:3673
 msgid "Not now"
 msgstr "現在不要"
 
-#: ../libempathy-gtk/empathy-chat.c:3552
+#: ../libempathy-gtk/empathy-chat.c:3717
 #: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "重試"
 
-#: ../libempathy-gtk/empathy-chat.c:3556
+#: ../libempathy-gtk/empathy-chat.c:3721
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請再試一次："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3686
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "此聊天室已被密碼保護："
 
-#: ../libempathy-gtk/empathy-chat.c:3713
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "參加"
 
-#: ../libempathy-gtk/empathy-chat.c:3901 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:3956
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "談話"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3961
+#: ../libempathy-gtk/empathy-chat.c:4130
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1610,7 +1640,7 @@ msgstr "被封鎖的聯絡人"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
+#: ../src/empathy-accounts-dialog.ui.h:4
 #: ../src/empathy-chatrooms-window.ui.h:3
 msgid "Remove"
 msgstr "移除"
@@ -1633,33 +1663,29 @@ msgstr "開啟連結(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:278
-msgid "Personal Information"
-msgstr "個人資訊"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:379
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
 #: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新增連絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:448
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
 #: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
 msgid "Block %s?"
 msgstr "封鎖 %s？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:453
+#: ../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 "您確定想要封鎖「%s」讓他無法再與您聯絡嗎？"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:458
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 #: ../libempathy-gtk/empathy-individual-dialogs.c:274
 msgid "_Block"
 msgstr "封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:476
+#: ../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"
@@ -1857,6 +1883,16 @@ msgstr "儲存大頭貼"
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+msgid "Personal Details"
+msgstr "個人細節"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Contact Details"
+msgstr "連絡人詳細資料"
+
 #: ../libempathy-gtk/empathy-contactinfo-utils.c:104
 msgid "Full name"
 msgstr "全名"
@@ -1940,11 +1976,6 @@ msgstr "用戶端資訊"
 msgid "Client:"
 msgstr "用戶端："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Contact Details"
-msgstr "連絡人詳細資料"
-
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
@@ -1965,28 +1996,28 @@ msgstr "OS："
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "請選擇這個連絡人要顯現在哪個群組。注意您可以選擇一個以上的群組或不選擇群組。"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "加入群組(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "選取"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-roster-window.c:1919
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
 msgid "Group"
 msgstr "群組"
 
@@ -2004,156 +2035,140 @@ msgstr[0] "下列識別身分無法被封鎖："
 msgid "Edit Contact Information"
 msgstr "編輯連絡人資訊"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "連結聯絡群"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:372
-msgid "Select contacts to link"
-msgstr "選取要連結的連絡人"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:447
-msgid "New contact preview"
-msgstr "新增連絡人預覽"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:491
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "在清單左方的所選聯絡人將連結在一起。"
-
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
 #. * of the user's account IDs (e.g. me@hotmail.com).
-#: ../libempathy-gtk/empathy-individual-menu.c:181
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:363
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "選取要用來放置通話的帳號"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:367
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
 #: ../src/empathy-streamed-media-window.c:1288
 #: ../src/empathy-call-window.ui.h:2
 msgid "Call"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:432
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "行動電話"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:434
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "工作"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:436
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "住家"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:677
+#: ../libempathy-gtk/empathy-individual-menu.c:658
 msgid "_Block Contact"
 msgstr "封鎖聯絡人(_B)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1055
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
 #: ../libempathy-gtk/empathy-new-message-dialog.c:319
 #: ../src/empathy-roster-window-menubar.ui.h:16
 msgid "_Chat"
 msgstr "聊天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1090
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
 #: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1123
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1156
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1197
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:26
 msgid "_Previous Conversations"
 msgstr "過往談話(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1256
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
 msgid "Share My Desktop"
 msgstr "分享我的桌面"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1282
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
 #: ../libempathy-gtk/empathy-individual-widget.c:1357
 msgid "Favorite"
 msgstr "喜好"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1310
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 尚未安裝"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "請安裝 gnome-contacts 來存取聯絡人細節。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1380
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1359
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1385
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contacts…"
-msgstr "連結聯絡人(_L)…"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1501
-#: ../src/empathy-chat-window.c:1011
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "邀請您到這個聊天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1547
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
 msgid "_Invite to Chat Room"
 msgstr "邀請到聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1743
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
 #: ../src/empathy-roster-window-menubar.ui.h:14
 msgid "_Add Contact…"
 msgstr "加入聯絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2355
+#: ../libempathy-gtk/empathy-individual-view.c:2306
 msgid "Delete and _Block"
 msgstr "刪除並封鎖(_B)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2390
+#: ../libempathy-gtk/empathy-individual-view.c:2341
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是否想要移除群組「%s」？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2393
+#: ../libempathy-gtk/empathy-individual-view.c:2344
 msgid "Removing group"
 msgstr "正在移除群組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2448
-#: ../libempathy-gtk/empathy-individual-view.c:2665
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2525
+#: ../libempathy-gtk/empathy-individual-view.c:2476
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是否想要移除連絡人「%s」？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2534
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2162,7 +2177,7 @@ msgstr ""
 "您真的想要移除連結聯絡人「%s」嗎？請注意這會移除所有構成此連結聯絡群的聯絡"
 "人。"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2546
+#: ../libempathy-gtk/empathy-individual-view.c:2497
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
@@ -2205,175 +2220,133 @@ msgstr "新增伺服器"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "連結聯絡人"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlink…"
-msgstr "取消連結(_U)…"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "完全將顯示的連結聯絡群分散為獨立的聯絡人。"
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "連結(_L)"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "要取消連結聯絡人「%s」的連結嗎？"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"您確定要取消這些連結聯絡群的連結？這會完全將連結聯絡群分散為獨立的聯絡人。"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "取消連結(_U)"
-
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "歷史"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "顯示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "搜尋"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "於 %s 內聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "與 %s 聊天中"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y %B %d %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分鐘"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通話時間 %s，結束於 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y年%B%e日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "任何時間"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任一個"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "誰"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何時"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文字聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:4
 msgid "Calls"
 msgstr "通話"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "播出"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "漏接來電"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什麼"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "您確定要刪除過往談話的所有紀錄嗎？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "清除全部"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "刪除從："
 
@@ -2459,7 +2432,7 @@ msgid "There was an error starting the conversation"
 msgstr "啟動談話時發生錯誤"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "請輸入聯絡人辨識身份或電話號碼："
 
@@ -2469,17 +2442,17 @@ msgid "New Conversation"
 msgstr "新增談話"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新增通話"
 
@@ -2535,7 +2508,7 @@ msgstr "自訂訊息…"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
@@ -2604,12 +2577,12 @@ msgstr "語音通話結束"
 msgid "Edit Custom Messages"
 msgstr "編輯自訂訊息"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1047
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "訊息編輯於 %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1752
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "一般"
 
@@ -2685,41 +2658,45 @@ msgid "Certificate hostname: %s"
 msgstr "憑證主機名稱：%s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-msgid "Continue"
-msgstr "繼續"
+msgid "C_ontinue"
+msgstr "繼續(_O)"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "未受信任的連線"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "此連線未受信任。您無論如何都要繼續嗎？"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "請記住此選擇以供未來連線使用"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "憑證詳細資料"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1742
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1860
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1935
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "空間不足以儲存檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1943
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr "需要 %s 的空間以儲存此檔案，但僅有 %s 可用。請選擇其他位置。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1987
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "收到來自 %s 的檔案"
@@ -2899,23 +2876,23 @@ msgstr "沒有錯誤訊息"
 msgid "Instant Message (Empathy)"
 msgstr "即時通訊 (Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通用戶端"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "聯絡帳號管理程式時發生錯誤"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2974,228 +2951,82 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "匯入帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "解析帳號詳細資料時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "建立帳號時發生錯誤。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "有錯誤發生。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "錯誤訊息為：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"您可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入帳"
-"號。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1274
-msgid "An error occurred"
-msgstr "發生錯誤"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "您的聊天帳號是哪一種？"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您還想要設定其他的聊天帳號嗎？"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "請輸入您的帳號詳細資料"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "您想要建立何種聊天帳號？"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "是否想要建立其他聊天帳號？"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "請輸入新帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
-msgstr ""
-"使用 Empathy 可以在線上跟附近的人聊天，或是和使用 Google Talk、AIM、Windows "
-"Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
-"訊通話。"
-
-#: ../src/empathy-account-assistant.c:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "您是否有使用其他聊天程式的帳號？"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "是的，請匯入我的帳號詳細資料於"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "是的，我現在要輸入帳號的詳細資料"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "不，我想要新的帳號"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "不，我現在只想看看附近有誰上線"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "選擇要匯入的帳號："
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "不，目前就這樣"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy 可以自動探索與您連線到相同網路上的人們，並且和他們聊天。如果您想要使"
-"用此功能，請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節，或是"
-"用「帳號」對話窗來停用此功能"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1150
-msgid "Edit->Accounts"
-msgstr "編輯 -> 帳號"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "我現在不想要啟用這項功能(_N)"
-
-#: ../src/empathy-account-assistant.c:1146
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"install the telepathy-salut package and create a People Nearby account from "
-"the Accounts dialog"
-msgstr ""
-"您無法與連線到您本機網路的人們聊天，因為 telepathy-salut 尚未安裝。如果您想要"
-"啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳"
-"號"
-
-#: ../src/empathy-account-assistant.c:1152
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 尚未安裝"
-
-#: ../src/empathy-account-assistant.c:1198
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "訊息與 VoIP 帳號助理"
-
-#: ../src/empathy-account-assistant.c:1232
-msgid "Welcome to Empathy"
-msgstr "歡迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1241
-msgid "Import your existing accounts"
-msgstr "匯入現有的帳號"
-
-#: ../src/empathy-account-assistant.c:1259
-msgid "Please enter personal details"
-msgstr "請輸入個人詳細資料"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存您的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1325
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:393
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:405
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網路連線"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:435
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"這個帳已經停用，因為它需要老舊、不再受支援的後端程式。請安裝 telepathy-haze "
+"並重新啟動您的作業階段來遷移帳號資料。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已停用"
 
-#: ../src/empathy-accounts-dialog.c:538
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "編輯連線參數"
 
-#: ../src/empathy-accounts-dialog.c:701
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "無法從伺服器擷取您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:707
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "上線以編輯您的個人資訊。"
 
-#: ../src/empathy-accounts-dialog.c:792
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "編輯連線參數(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1293
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是否想要從您的電腦上移除群組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1297
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "這不會移除伺服器上的您的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1533
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3204,15 +3035,23 @@ msgstr ""
 "您所做的變更。確定要繼續？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1744
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "啟用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1745
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "停用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2255
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "略過(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "連接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3229,20 +3068,16 @@ msgid "Loading account information"
 msgstr "正在載入帳號資訊"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "尚未安裝通訊協定"
+msgid "No protocol backends installed"
+msgstr "尚未安裝通訊協定後端程式"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "協定："
-
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "要加入新的帳號，您必須先安裝每個會用到的通訊協定後端程式。"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Import…"
 msgstr "匯入(_I)…"
 
@@ -3254,15 +3089,11 @@ msgstr "- Empathy 認證用戶端"
 msgid "Empathy authentication client"
 msgstr "Empathy 認證用戶端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr "- Empathy 音訊視訊用戶端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 音訊視訊用戶端"
 
@@ -3305,98 +3136,98 @@ msgstr "詳細資料"
 #. 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:1209
-#: ../src/empathy-call-window.c:1927
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2171
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "機器看見的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2173
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網際網路上的伺服器看見的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2175
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "其他端看見的點的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2177
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中繼伺服器的 IP 位址"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2179
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多點廣播群組的 IP 位址"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3033
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3072
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:3077
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
 
-#: ../src/empathy-streamed-media-window.c:2249
-#: ../src/empathy-call-window.c:3083
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
 
-#: ../src/empathy-streamed-media-window.c:2255
-#: ../src/empathy-call-window.c:3089
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "這個網路上有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3093
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3406,23 +3237,23 @@ msgstr ""
 "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
 "從求助選單內的「除錯」視窗中所收集的紀錄。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3117
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已達串流末端"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3160
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串流"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3170
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "無法建立視訊串流"
 
@@ -3513,8 +3344,8 @@ msgstr "切換視訊傳播"
 
 #: ../src/empathy-call-window.ui.h:21
 #: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
-#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "不明"
 
@@ -3555,46 +3386,87 @@ msgid "_Settings"
 msgstr "設定值(_S)"
 
 #: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-roster-window-menubar.ui.h:30
+#: ../src/empathy-roster-window-menubar.ui.h:29
 #: ../src/empathy-streamed-media-window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "要關閉這個視窗？"
+
+#: ../src/empathy-chat-window.c:294
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "關閉此視窗會離開 %s。您將無法接收到之後的訊息，除非您再次參與。"
+
+#: ../src/empathy-chat-window.c:305
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"關閉此視窗會離開 %u 個聊天室。您將無法接收到之後的訊息，除非您再次參與。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "離開 %s？"
+
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "您將無法接收到此聊天室之後的訊息，除非您再次參與。"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "關閉視窗"
+
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "離開聊天室"
+
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "SMS："
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在傳送 %d 個訊息"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "正在輸入訊息。"
 
@@ -3674,96 +3546,96 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "傳入的視訊通話"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 要與您進行視訊通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 要與您進行通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
+#: ../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 "%s 的來電"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "以視訊接聽(_A)"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1561
+#: ../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 "來自 %s 的視訊通話"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "聊天室邀請"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您參加 %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "參加(_J)"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您參加 %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀請參加 %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:371
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需要密碼"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 想要得到查看您是否上線的許可"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3883,86 +3755,108 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完成、已取消和失敗的檔案傳輸"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "匯入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找不到可匯入的帳號。Empathy 目前只支援從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "匯入"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "來源"
 
-#: ../src/empathy-roster-window.c:388
+#: ../src/empathy-roster-window.c:391
 msgid "Provide Password"
 msgstr "提供密碼"
 
-#: ../src/empathy-roster-window.c:394
+#: ../src/empathy-roster-window.c:397
 msgid "Disconnect"
 msgstr "斷線"
 
-#: ../src/empathy-roster-window.c:626
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需要設置一個帳號才能在這裡查看聯絡人。"
+
+#: ../src/empathy-roster-window.c:673
 msgid "No match found"
 msgstr "找不到符合項目"
 
-#: ../src/empathy-roster-window.c:733
+#: ../src/empathy-roster-window.c:783
 #, c-format
 msgid "Sorry, %s accounts can’t be used until your %s software is updated."
 msgstr "很抱歉，%s 帳號無法使用，除非您的 %s 軟體已更新。"
 
-#: ../src/empathy-roster-window.c:799
+#: ../src/empathy-roster-window.c:849
 msgid "Update software..."
 msgstr "更新軟體..."
 
-#: ../src/empathy-roster-window.c:805 ../src/empathy-roster-window.c:922
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-roster-window.c:910
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "重新連接"
 
-#: ../src/empathy-roster-window.c:916
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
 msgstr "編輯帳號"
 
 #. Translators: this string will be something like:
 #. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1060
+#: ../src/empathy-roster-window.c:1110
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "加值 %s (%s)..."
 
-#: ../src/empathy-roster-window.c:1106
+#: ../src/empathy-roster-window.c:1156
 msgid "Top up account credit"
 msgstr "加值帳號存額"
 
 #. top up button
-#: ../src/empathy-roster-window.c:1178
+#: ../src/empathy-roster-window.c:1228
 msgid "Top Up..."
 msgstr "加值..."
 
-#: ../src/empathy-roster-window.c:1901
+#: ../src/empathy-roster-window.c:1952
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../src/empathy-roster-window.c:2296
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需要啟用您其中之一的帳號之才能在這裡查看聯絡人。"
+
+#. 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 "您需要啟用 %s 才能在這裡查看聯絡人。"
+
+#: ../src/empathy-roster-window.c:2460
 msgid "Contact List"
 msgstr "連絡人清單"
 
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帳號設定值"
+
 #: ../src/empathy-roster-window-menubar.ui.h:1
 msgid "Contacts on a _Map"
 msgstr "連絡人地圖(_M)"
@@ -4041,15 +3935,11 @@ msgstr "新增談話(_N)…"
 msgid "_Offline Contacts"
 msgstr "離線連絡人(_O)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "個人資訊(_P)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-roster-window-menubar.ui.h:27
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-roster-window-menubar.ui.h:29
+#: ../src/empathy-roster-window-menubar.ui.h:28
 msgid "_Search for Contacts…"
 msgstr "搜尋聯絡人(_S)…"
 
@@ -4078,6 +3968,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
@@ -4130,7 +4025,7 @@ msgid "New conversation"
 msgstr "新增談話"
 
 #: ../src/empathy-preferences.c:169
-msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "連絡人上線"
 
 #: ../src/empathy-preferences.c:170
@@ -4150,46 +4045,46 @@ msgid "Language"
 msgstr "語言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:725
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "祝英台"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:732
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "梁山伯"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:738
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "白玉環與蝴蝶墜，為何不能夫妻配？"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "豈知你我自作主，無人當它是聘媒。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:744
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "豈知好事成虛話，棒打鴛鴦兩離分。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "爹爹許了馬家婚，心已碎，意難伸。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "將來有命終相見，無命今生不相逄。"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "祝英台已斷線"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -4294,51 +4189,51 @@ msgid "Spell Checking"
 msgstr "拼字檢查"
 
 #: ../src/empathy-preferences.ui.h:26
+msgid "Start chats in:"
+msgstr "開啟聊天於："
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:28
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:29
 msgid "Use _echo cancellation to improve call quality"
 msgstr "使用回音消除來改善通話品質(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:30
 msgid "Variant:"
 msgstr "樣式："
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Automatically connect on startup"
 msgstr "啟動時自動連線(_A)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "手機(_C)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Network (IP, Wi-Fi)"
 msgstr "網路 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid "_Open new chats in separate windows"
-msgstr "在個別視窗開啟新的聊天(_O)"
-
 #: ../src/empathy-preferences.ui.h:37
 msgid "_Publish location to my contacts"
 msgstr "對我的連絡人公開位置(_P)"
@@ -4348,6 +4243,14 @@ msgstr "對我的連絡人公開位置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "降低位置準確度(_R)"
 
+#: ../src/empathy-preferences.ui.h:40
+msgid "new _windows"
+msgstr "新視窗(_W)"
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "new ta_bs"
+msgstr "新分頁(_B)"
+
 #: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
@@ -4408,63 +4311,84 @@ msgstr "視訊預覽"
 msgid "Contact Map View"
 msgstr "連絡人地圖檢視"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 連結"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 回應"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "對於單一貼上來說資料量過大。請儲存紀錄至檔案。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "偵錯視窗"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "傳送至 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "偵錯"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "訊息"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "嚴重"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4483,32 +4407,28 @@ msgstr "選擇想要邀請進入談話的聯絡人："
 msgid "Invite"
 msgstr "邀請"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "不要顯示任何對話窗；執行任何作業 (例：匯入) 並離開"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "不要顯示任何對話窗，除非只有「附近的人」帳號"
 
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "顯示帳號助理"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy 帳號"
 
@@ -4524,85 +4444,85 @@ msgstr "- Empathy 除錯器"
 msgid "Empathy Debugger"
 msgstr "Empathy 除錯程式"
 
-#: ../src/empathy-chat.c:107
+#: ../src/empathy-chat.c:109
 msgid "- Empathy Chat Client"
 msgstr "- Empathy 聊天用戶端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "回應"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1565
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1566
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接聽"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以視訊接聽"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒絕"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接受"
 
 #. 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:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "提供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 剛剛播打給您，但您正與他人通話。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "訊"
 
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "保留"
 
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "靜音"
 
-#: ../src/empathy-call-window.c:2934
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "時間"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2937
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3207
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您目前的餘額為 %s。"
 
-#: ../src/empathy-call-window.c:3211
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "很抱歉，您的存額不足以進行該通話。"
 
-#: ../src/empathy-call-window.c:3213
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "加值"
 
@@ -4610,10 +4530,192 @@ msgstr "加值"
 msgid "_Match case"
 msgstr "比對大小寫(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "您的聊天帳號是哪一種？"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "新增帳號"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../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."
+msgstr ""
+"Empathy 可以自動探索與您一同連線到相同網路上的人們，並且和他們聊天。如果您想"
+"使用此功能，請檢查下列詳細資料是否正確。"
+
+#: ../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 ""
+"您可以稍候變更這些細節，或藉由選擇「聯絡人清單」中的 <span style=\"italic\">"
+"編輯 → 帳號</span> 停用這個功能。"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "連結聯絡群"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "選取要連結的連絡人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新增連絡人預覽"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在清單左方的所選聯絡人將連結在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "連結聯絡人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "連結聯絡人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "取消連結(_U)…"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全將顯示的連結聯絡群分散為獨立的聯絡人。"
+
+#~ msgid "_Link"
+#~ msgstr "連結(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "要取消連結聯絡人「%s」的連結嗎？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您確定要取消這些連結聯絡群的連結？這會完全將連結聯絡群分散為獨立的聯絡人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "取消連結(_U)"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "匯入帳號時發生錯誤。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "解析帳號詳細資料時發生錯誤。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "建立帳號時發生錯誤。"
+
+#~ msgid "There was an error."
+#~ msgstr "有錯誤發生。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "錯誤訊息為：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入"
+#~ "帳號。"
+
+#~ msgid "An error occurred"
+#~ msgstr "發生錯誤"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您還想要設定其他的聊天帳號嗎？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "請輸入您的帳號詳細資料"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想要建立何種聊天帳號？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "是否想要建立其他聊天帳號？"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "請輸入新帳號的詳細資料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy 可以在線上跟附近的人聊天，或是和使用 Google Talk、AIM、"
+#~ "Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以"
+#~ "進行語音或視訊通話。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您是否有使用其他聊天程式的帳號？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "是的，請匯入我的帳號詳細資料於"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "是的，我現在要輸入帳號的詳細資料"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "不，我想要新的帳號"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "不，我現在只想看看附近有誰上線"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "選擇要匯入的帳號："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "不，目前就這樣"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "編輯 -> 帳號"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "我現在不想要啟用這項功能(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您無法與連線到您本機網路的人們聊天，因為 telepathy-salut 尚未安裝。如果您"
+#~ "想要啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近"
+#~ "的人」帳號"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "訊息與 VoIP 帳號助理"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "歡迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "匯入現有的帳號"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "請輸入個人詳細資料"
+
+#~ msgid "Protocol:"
+#~ msgstr "協定："
+
+#~ msgid "Show account assistant"
+#~ msgstr "顯示帳號助理"
+
+#~ msgid "Personal Information"
+#~ msgstr "個人資訊"
+
+#~ msgid "_Personal Information"
+#~ msgstr "個人資訊(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在個別視窗開啟新的聊天(_O)"
+
 #~ msgid "Call volume"
 #~ msgstr "通話音量"
 
@@ -4877,8 +4979,5 @@ msgstr "新增帳號"
 #~ msgid "Hidden"
 #~ msgstr "隱藏"
 
-#~ msgid "User requested disconnect"
-#~ msgstr "連接不上要求的使用者"
-
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>位置</b>"