[empathy] Updated Telugu Translations



commit c1d1ac2f72c0caccdecafbdcf29112e1292f6b68
Author: Krishnababu Krothapalli <kkrothap redhat com>
Date:   Thu Sep 20 15:57:21 2012 +0530

    Updated Telugu Translations

 po/te.po | 3730 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 1902 insertions(+), 1828 deletions(-)
---
diff --git a/po/te.po b/po/te.po
index b57cad2..a26523d 100644
--- a/po/te.po
+++ b/po/te.po
@@ -2,26 +2,26 @@
 # Copyright (C) 2011, 2012 Swecha Telugu localisation Team <localization swecha net>
 # This file is distributed under the same license as the empathy package.
 #
-# Krishna Babu K <kkrothap redhat com>, 2009.2011
+# Krishna Babu K <kkrothap redhat com>, 2009.2011, 2012.
 # Praveen Illa <mail2ipn gmail com>, 2011.
-# Sasi Bhushan Boddepalli <Sasi swecha net>,2011, 2012
-# Naveen kandimala(Swecha) <naveen swecha net>, 2012
+# Sasi Bhushan Boddepalli <Sasi swecha net>,2011, 2012.
+# Naveen kandimala(Swecha) <naveen swecha net>, 2012.
 # GVS.Giri (Swecha Team) <gvs giri947 gmail com>,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: 2012-04-16 18:23+0000\n"
-"PO-Revision-Date: 2012-04-17 18:24+0530\n"
-"Last-Translator: Sasi Bhushan Boddepalli <sasi swecha net>\n"
-"Language-Team: Telugu <indlinux-telugu lists sourceforge net>\n"
+"POT-Creation-Date: 2012-09-18 11:40+0000\n"
+"PO-Revision-Date: 2012-09-19 01:26+0530\n"
+"Last-Translator: Krishnababu Krothapalli <kkrothap redhat com>\n"
+"Language-Team: Telugu <Fedora-trans-te redhat com>\n"
+"Language: te\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"
+"X-Generator: Lokalize 1.4\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"Language: te\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -29,7 +29,7 @@ msgstr "ààààà"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "IM Client"
-msgstr "IM àààààààà"
+msgstr "IM ààààààààà"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
@@ -39,58 +39,52 @@ 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:2527
-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
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "àààààààà àààààààààààà ààààà ààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr ""
-"àààààààààààà àààààààààààààààà/ààààà ààààààààààààààà àààààààà àààààààààààà ààààààààààà ààààà."
+"àààààààààààà àààààààààààààààà/ààààà ààààààààààààààà àààààààà àààààààààààà "
+"ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
 msgstr "ààààààààààà ààààà ààààààà-àààààààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "ààààà ààààààà ààààààààààà àà ààààààààààà àààààààààààà àààààààààààà ààààà."
+msgstr ""
+"ààààà ààààààà ààààààààààà àà ààààààààààà àààààààààààà àààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "ààààà ààààààà ààààààà àààààà àààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
-msgstr "ààààà ààààààà àààààààà àààà ààààààà àààààààààààà àààààà àààà ààààààààààà àààààààà ààààà."
+msgstr ""
+"ààààà ààààààà àààààààà àààà ààààààà àààààààààààà àààààà àààà ààààààààààà "
+"àààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
 msgstr "ààààà ààààààà ààààâàààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "ààààà ààààààààààà ààààààààà àààààààààààà ààààààà ààààà."
 
 #. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr "àààààààà ààààààà ààààààààà àààààààààààààà ààààààààààà "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
 "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
 "should be executed or not. Users should not change this key manually."
@@ -98,787 +92,704 @@ msgstr ""
 "ààààà-àààààààààààà-cleaning.c àààà àààààààààà àààà ààààà ààààà à ààààà "
 "àààààààààààààààààààààààààà ààààààààà à àà ààààààààà àààà àààààà àààà àààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "àààâàààà ààààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "ààààà àààààà àààà àààâàààààà àààà ààààààààà ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Show avatars"
-msgstr "àààààààààà ààààààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "àààà ààààààà ààààà ààààà ààààààààà àààààààà àààà àààààààààà ààààààààà ààààà."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Show protocols"
-msgstr "àààààààààààààà ààààààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ààààà àààààààà àààààààà ààààà àààààààààààààà ààààààààà ààààà."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
 msgstr "ààààà àààààààà àààààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 msgid "Whether to show account balances in the contact list."
 msgstr "ààààà àààààààààà àààà àààààààààà ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Compact contact list"
-msgstr "ààààààààà ààààà àààààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Whether to show the contact list in compact mode."
-msgstr "ààààà àààààààà ààààààààà ààààààà ààààààààà ààààà."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "àààààà ààààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "àààààà ààààààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "ààààà ààààààà ààààààààààà ààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ààààààà ààààààà àààààààààààààààà àààà ààààààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "ààààà ààààâààà àààààààà àààààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 msgid "Always open a separate chat window for new chats."
 msgstr "ààààà ààààâààà àààààààààà àà àààà ààààà àààà ààààààà àààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "ààààààààààà àààààà àààààà àààààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 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:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "àààà ààààà ààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "ààààààà(àààà) àààààà ààààààà ààà ààààà ààààààà(àààààààà ààà)"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "ààààààààà ààààààààààà  ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 msgid "Whether to show groups in the contact list."
 msgstr "ààààààààà ààààà àààààààà   ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Contact list sort criterion"
-msgstr "ààààà àààààà àààààààààààà ààààààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-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:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "ààààààà ààààààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 msgid "Whether to play a sound to notify of events."
 msgstr "àààààà àààààààààààà àààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "àààààà àààààààààà ààààààààà ààààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ààààààààààààààààà àààà àààààààààààà àààà ààààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "ààààààààààà àààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 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.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "ààààààààà àààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "ààààààààààà àààààààààà àààààààààààà àààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "ààààà ààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "ààààà ààààààààà àààààààààààà àààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "àààààà ààààààààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "ààààâààààààà ààààààààààààààà àààààààààà àààààààààà àààààà ààààààààààà ààààà."
+msgstr ""
+"ààààâààààààà ààààààààààààààà àààààààààà àààààààààà àààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "àààààà ààààààààààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 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:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "àààà ààààààààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 msgid "Whether to play a sound when logging into a network."
 msgstr "ààààâààààààààà ààààààààààààààà àààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "àààà ààààààààààààààààà àààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ààààâààààà ààààà ààààààààààààààààà àààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "ààààà ààààààààà ààààà ààààààà ààààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "àà ààààà ààààààà àààààààààààà ààààààààà àààààààà ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "àààààà àààààààààà ààààààà ààààààààà ààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
 msgstr "àààààà àààà àààààààààààà ààààààààà ààààààààà ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "àààà àà àààààà ààààààààààà ààààààààà ààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr ""
-"ààààà àààà ààààààà ààààààààààà, àààààà ààààààààààà, àà ààààà ààààààà àààààààààààà ààààààààà àààààààà "
+"ààààà àààà ààààààà ààààààààààà, àààààà ààààààààààà, àà ààààà ààààààà "
+"àààààààààààà ààààààààà àààààààà "
 "ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr "àààààà àààààà àààààààààà àààààààà ààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "àà àààààà àààâààààâàà àààààààààààà ààààààààà àààààà àààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr "àààààà ààààààààààààààààà ààààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "àà àààààà àààâààààâàà ààààààààààààà ààààààààà àààààààà àààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "ààààààààà àààààààààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "ààààààààà àààààààààààà ààààààààà àààààààààààà àààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "àààààà ààààà àààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 msgid "Whether to show the contact list in chat rooms."
 msgstr "àààà àààààà ààààà àààààààà ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "àààà ààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "àààà àààààààààààààààà àààààààààààààà àààààààààààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 msgid "Chat window theme variant"
 msgstr "àààààààààààà àààààà (àààà ààààà) ààà àààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.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:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 msgid "Path of the Adium theme to use"
 msgstr "àààààààààààà àààààà àààà ààààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "ààààà ààààâààà àààààààààà àààà àààààà ààààà àààààà àààà ààààààààà ààààààà àààà."
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
+#| msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr ""
+"ààààà ààààâààà àààààààààà àààà àààààà ààààà àààààà àààà ààààààààà ààààààà "
+"àààà. ààààààààààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "ààààâàààà ààààààààààààààà ààààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "àààà àààâààààààààà àààà ààààâàààà ààààààà àààààààà àààààà àààààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "àààà àààà ààààà àààààà àààààààààààà ààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
 msgstr ""
-"àààà àààààà ààààààààààààà àààà àààààààààààà ààààààààààààààààà  àààààà. ààààààààà àààà àààààààà àààààààà "
+"àààà àààààà ààààààààààààà àààà àààààààààààà ààààààààààààààààà  àààààà. "
+"ààààààààà àààà àààààààà àààààààà "
 "ààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "àààà àààà ààààà àààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 msgid "Whether to use the theme for chat rooms."
 msgstr "àààà àààà ààààà àààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "ààààààààà ààààààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 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:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "àààààààààà ààààààààààààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
-msgstr "àààà àààààààààààààààààà àààààà ààààààààààààà ààààààà àààààààààààà ààààà."
+msgstr ""
+"àààà àààààààààààààààààà àààààà ààààààààààààà ààààààà àààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "àààààààààà àààààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr ""
-"ààààà àààà àààà àààà ààààààààà (àààààà) ààààààààààààààààààà àààààààà àààààà àààààààààà ààààààà."
+"ààààà àààà àààà àààà ààààààààà (àààààà) ààààààààààààààààààà àààààààà àààààà "
+"àààààààààà ààààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ààààà àààààà ààààà ààààààààà àààà ààààà àààààà ààà ààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "ààààà ààààààà ààààà ààààààààà àààà ààààà àààààà ààà ààààààààààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
 msgid "Last account selected in Join Room dialog"
 msgstr "ààà ààààààà ààààà ààààà àààààà ààààààààà "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
-msgstr "ààààààà àààààààààààà ààààà àààà ààààà D-Bus ààààààààà àààààà ààààààààà. "
+msgstr ""
+"ààààààà àààààààààààà ààààà àààà ààààà D-Bus ààààààààà àààààà ààààààààà. "
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "àààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "àààààà àààààà àà àààààààààààààà ààààààà àààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "àààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr "àààààà ààààààà ààààààà ààààààààà àààà àààààà  àààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "ààà àààààààà àààààààààààààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "àààààààààààà ààààààààà àààààààà, ààà àààààà àààààààà ààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "àààààà ààààààà ààààààààààà àààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
-msgstr "àààààà ààààààà ààààààà ààààààààà 'x' ààààâàà ààààààààààààà ààààààà àààààà ààààààààà ààààà."
+msgstr ""
+"àààààà ààààààà ààààààà ààààààààà 'x' ààààâàà ààààààààààààà ààààààà àààààà "
+"ààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
 msgstr "ààààà ààààààà ààààà ààààààààà ààààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "ààààààà àààà ààààààààà àààà àààààààààà ààààà àààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy can use the network to guess the location"
 msgstr "ààààààààà ààààààààààààà ààààà ààààâààààààà àààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "ààààààààà àààààààààààà ààààà ààààâààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "ààààààààà ààààà ààààààà ààààà ààààààààà ààààâààààààà àààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "ààààààààà àààààààààààà ààààà ààààààààà ààààâààààààà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
 msgid "Empathy can use the GPS to guess the location"
 msgstr "ààààààààà àààààààààààà ààààà GPSàà àààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "ààààààààà àààààààààààà ààààà GPSàà ààààààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "ààààààà ààààà ààààààààààààà ààààà ààààà àààààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:107
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "ààààààà àààààà àààààààà ààààààà ààààà àààààààààààààà ààààà àààààààààà ààààà."
+msgstr ""
+"ààààààà àààààà àààààààà ààààààà ààààà àààààààààààààà ààààà àààààààààà ààààà."
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:733
 msgid "No reason was specified"
 msgstr "ààààààà ààààà ààààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "The change in state was requested"
 msgstr "àààààààà àààààà àààààààààààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "You canceled the file transfer"
 msgstr "àààà àààà àààààààààà ààààààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "The other participant canceled the file transfer"
 msgstr "ààààààààà ààààà àààà àààààààààà ààààààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "Error while trying to transfer the file"
 msgstr "àààààà àààààààààààà ààààààààààààààààààààà ààààà"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "The other participant is unable to transfer the file"
 msgstr "ààààààààà àààààà àààà ààààààààààààààààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:751 ../libempathy/empathy-utils.c:306
 msgid "Unknown reason"
 msgstr "ààààààà ààààà"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:914
 msgid "File transfer completed, but the file was corrupted"
 msgstr "àààà ààààà àààààààààà, àààà àààà ààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1200
 msgid "File transfer not supported by remote contact"
 msgstr "àààà ààààà àààààà àààààà àààààà ààààààààààààààà"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1256
 msgid "The selected file is not a regular file"
 msgstr "ààààààààà àààà àààààà àààà àààà"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1265
 msgid "The selected file is empty"
 msgstr "ààààààààà àààà àààààà"
 
-#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:85 ../libempathy/empathy-keyring.c:194
+msgid "Password not found"
+msgstr "àààààààà àààààààààààààààààà "
+
+#: ../libempathy/empathy-keyring.c:594
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "IM àààà ààààà àààààààà %s (%s)"
+
+#: ../libempathy/empathy-keyring.c:631
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "%s (%s) àààààààà ààààààà ààà ààààà àààààààà '%s'"
+
+#: ../libempathy/empathy-message.c:403 ../src/empathy-call-observer.c:116
 #, c-format
 msgid "Missed call from %s"
 msgstr "%s ààààà àààààààà àààà àààààààà"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:411
+#: ../libempathy/empathy-message.c:407
 #, c-format
 msgid "Called %s"
 msgstr "%s àààààààààà"
 
-#: ../libempathy/empathy-message.c:414
+#: ../libempathy/empathy-message.c:410
 #, c-format
 msgid "Call from %s"
 msgstr "%s àààààààààà"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-time.c:90
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d ààààà àààààà"
+msgstr[1] "%d àààààà àààààà"
+
+#: ../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:102
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d ààà àààààà"
+msgstr[1] "%d àààà àààààà"
+
+#: ../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:114
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d ààààà àààààà"
+msgstr[1] "%d àààààà àààààà"
+
+#: ../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:142
+msgid "in the future"
+msgstr "àààààààààààà"
+
+#: ../libempathy/empathy-utils.c:226
 msgid "Available"
 msgstr "àààààààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:228
 msgid "Busy"
 msgstr "ààààààààà"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:231
 msgid "Away"
 msgstr "àààààà ààààààà"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:233
 msgid "Invisible"
 msgstr "àààààààààà ààààààà"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:235
 msgid "Offline"
 msgstr "àààâàààààà ààààààà"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:238
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ààààààà"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:278
 msgid "No reason specified"
 msgstr "à àààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:280 ../libempathy/empathy-utils.c:336
 msgid "Status is set to offline"
 msgstr "àààààà àààâààààâàà ààààààààààà."
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:282 ../libempathy/empathy-utils.c:316
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "ààààâààààà ààààà"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:284 ../libempathy/empathy-utils.c:318
 msgid "Authentication failed"
-msgstr "ààààààààààà ààààààààà"
+msgstr "ààààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:320
 msgid "Encryption error"
 msgstr "àààâààààààààà ààààà"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:288
 msgid "Name in use"
 msgstr "àààà ààààààà àààà"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:322
 msgid "Certificate not provided"
 msgstr "àààààààààààà ààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:324
 msgid "Certificate untrusted"
 msgstr "àààààààààààà àààààààààà"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:294 ../libempathy/empathy-utils.c:326
 msgid "Certificate expired"
 msgstr "àààààààààààà ààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not activated"
 msgstr "àààààààààààààààà ààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate hostname mismatch"
 msgstr "ààààààààààà àààààààààààà àààààààààààà"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate fingerprint mismatch"
 msgstr "àààààààààààà ààààààààà àààààààààààà"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate self-signed"
 msgstr "àààààààààààà ààààààà-ààààà ààààààà"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:304
 msgid "Certificate error"
 msgstr "ààààààààààà ààààà"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:338
 msgid "Encryption is not available"
 msgstr "àààâààààààààà àààààààààà àààà"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:340
 msgid "Certificate is invalid"
 msgstr "àààààààààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:342
 msgid "Connection has been refused"
 msgstr "àààààààààà àààààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:344
 msgid "Connection can't be established"
 msgstr "àààààààààààà àààààààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:346
 msgid "Connection has been lost"
 msgstr "àààààààààààà ààààààààààà"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:348
 msgid "This account is already connected to the server"
 msgstr "à àààà àààààààààà ààààààààà ààààààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:350
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
-msgstr "àààààààààà ààà àààààà ààààààààààààà àà ààààà àààààààààààà àààààààààààààààààà"
+msgstr ""
+"àààààààààà ààà àààààà ààààààààààààà àà ààààà àààààààààààà àààààààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:353
 msgid "The account already exists on the server"
 msgstr "àààààààà à àààà ààààààà àààààà"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:355
 msgid "Server is currently too busy to handle the connection"
 msgstr "àààààààààààà ààààààààààààà ààààààààà àààààààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:357
 msgid "Certificate has been revoked"
 msgstr "àààààààààààà ààààààààààààà"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:359
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
-msgstr "àààààààààààààà ààààà àààààààààà àààà ààààààààààààààààààà àààààààà àààààààààààààààà ààààààààà"
+msgstr ""
+"àààààààààààààà ààààà àààààààààà àààà ààààààààààààààààààà àààààààà "
+"àààààààààààààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:362
 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
+#: ../libempathy/empathy-utils.c:366
 msgid "Your software is too old"
 msgstr "àà àààààà àààà àààà ààààà "
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:368
 msgid "Internal error"
 msgstr "ààààààà ààààà "
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:497
 msgid "People Nearby"
 msgstr "ààààààààà ààààààààà"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:502
 msgid "Yahoo! Japan"
 msgstr "àààà! ààààà"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:531
 msgid "Google Talk"
 msgstr "àààààà àààà"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:532
 msgid "Facebook Chat"
 msgstr "ààààâàààà àààà"
 
-#: ../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:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d ààààààà àààààà"
-msgstr[1] "%d ààààààà àààààà"
-
-#: ../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:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d àààà àààààà"
-msgstr[1] "%d ààààà àààààà"
-
-#: ../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:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d ààà àààààà"
-msgstr[1] "%d àààà àààààà"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "àààààààààààà"
-
-#: ../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 "IM àààà ààààà àààààààà %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
+#: ../libempathy-gtk/empathy-account-chooser.c:689
 msgid "All accounts"
 msgstr "àààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:323
-msgid "Account"
-msgstr "àààà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:683
-msgid "Password"
-msgstr "àààààààà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:684
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
-msgid "Server"
-msgstr "àààààà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
-msgid "Port"
-msgstr "àààààà"
-
-#: ../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:16
-msgid "Username:"
-msgstr "ààààààà àààà:"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1710
-msgid "A_pply"
-msgstr "ààààààààààà (_p)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1739
-msgid "L_og in"
-msgstr "àààààààààà (_J)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1810
-msgid "This account already exists on the server"
-msgstr "àààààààà à àààà àààààààààà àààààà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1814
-msgid "Create a new account on the server"
-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:2236
-#, 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:2262
-#, c-format
-msgid "%s Account"
-msgstr "%s àààà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2266
-msgid "New account"
-msgstr "ààààà àààà"
-
 #: ../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 "àààààààà (_w):"
+#| msgid "Pass_word:"
+msgid "Pass_word"
+msgstr "àààààààà (_w)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-msgid "Screen _Name:"
-msgstr "ààà àààà (_N):"
+#| msgid "Screen _Name:"
+msgid "Screen _Name"
+msgstr "ààà àààà (_N)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "<b>Example:</b> MyScreenName"
@@ -899,29 +810,29 @@ msgstr "àààààààà ààààààààààààà"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Port:"
-msgstr "àààààà (_P):"
+#| msgid "_Port:"
+msgid "_Port"
+msgstr "àààààà (_P)"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "_Server:"
-msgstr "àààààà (_S):"
+#| msgid "_Server:"
+msgid "_Server"
+msgstr "ààààà (_S)"
 
 #: ../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:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
@@ -944,37 +855,113 @@ msgstr "àà AIM ààààààààà ààààà?"
 msgid "Remember Password"
 msgstr "àààààààà ààààààààààààà"
 
-#: ../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:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr "<b>àààààà:</b> ààààààààààà"
+#: ../libempathy-gtk/empathy-account-widget.c:675
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:322
+msgid "Account"
+msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "àà ààààààààà ààààààà ààà ààààà?"
+#: ../libempathy-gtk/empathy-account-widget.c:676
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "àààààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-msgid "What is your GroupWise password?"
-msgstr "àà àààààààà ààààààààà ààààà?"
+#: ../libempathy-gtk/empathy-account-widget.c:677
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "àààààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "àààààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:762
+#, c-format
+msgid "%s"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:817
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1429
+msgid "Username:"
+msgstr "ààààààà àààà:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1746
+msgid "A_pply"
+msgstr "ààààààààààà (_p)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1775
+msgid "L_og in"
+msgstr "àààààààààà (_J)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1845
+msgid "This account already exists on the server"
+msgstr "àààààààà à àààà àààààààààà àààààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1849
+msgid "Create a new account on the server"
+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:2270
+#, 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:2296
+#, c-format
+msgid "%s Account"
+msgstr "%s àààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2300
+msgid "New account"
+msgstr "ààààà àààà"
+
+#: ../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:"
+msgid "Login I_D"
+msgstr "àààààààààà ààà (_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>àààààà:</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:9
+msgid "What is your GroupWise password?"
+msgstr "àà àààààààà ààààààààà ààààà?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+#| msgid "ICQ _UIN:"
+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:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Ch_aracter set:"
-msgstr "ààààà ààààà (_a):"
+#| msgid "Ch_aracter set:"
+msgid "Ch_aracter set"
+msgstr "ààààà ààààà (_a)"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
@@ -984,53 +971,21 @@ msgstr "àà ICQ UIN ààààà?"
 msgid "What is your ICQ password?"
 msgstr "àà ICQ ààààààààà ààààà?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:207
-#: ../libempathy-gtk/empathy-account-widget-sip.c:240
-msgid "Auto"
-msgstr "ààààà"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:210
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:213
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
-msgid "TLS"
-msgstr "TLS"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:245
-msgid "Register"
-msgstr "ààààààààààààà"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:250
-msgid "Options"
-msgstr "ààààààààà"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:253
-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 "ààààâààààà:"
+#| msgid "Character set:"
+msgid "Character set"
+msgstr "ààààà ààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
-msgid "Character set:"
-msgstr "ààààà ààààà:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Addâ"
 msgstr "àààààà..."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
 #: ../src/empathy-accounts-dialog.ui.h:2
@@ -1039,48 +994,53 @@ msgid "Remove"
 msgstr "àààààààà "
 
 #. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "ààà"
 
 #. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Down"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr ""
-"àààà IRC àààààààà àààà àààààààààààààà àààà àààà àààà, àà ààààààààààà ààààà ààààààà, ààààààààà ààààà "
+"àààà IRC àààààààà àààà àààààààààààààà àààà àààà àààà, àà ààààààààààà ààààà "
+"ààààààà, ààààààààà ààààà "
 "àààà."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Nickname:"
-msgstr "àààààààà:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#| msgid "Nickname:"
+msgid "Nickname"
+msgstr "àààààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Password:"
-msgstr "àààààààà:"
+#| msgid "Quit message:"
+msgid "Quit message"
+msgstr "ààààààààà àààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
-msgid "Quit message:"
-msgstr "ààààààààà àààààà:"
+#| msgid "Real name:"
+msgid "Real name"
+msgstr "àààà àààà"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
-msgid "Real name:"
-msgstr "àààà àààà:"
+#| msgid "Username:"
+msgid "Username"
+msgstr "ààààààà àààà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "à IRC ààààâààààà?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "àà IRC àààààààà ààààà?"
 
@@ -1098,7 +1058,8 @@ 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:6
@@ -1126,25 +1087,27 @@ msgid "I_gnore SSL certificate errors"
 msgstr "SSL ààààààààààà àààààààà ààààààààà (_g)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
-msgstr "àààààààààà (_o):"
+#| msgid "Priori_ty:"
+msgid "Priori_ty"
+msgstr "àààààààààà (_t)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
-msgstr "àààà (_u):"
+#| msgid "Reso_urce:"
+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 "ààà SS_L àààà"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
 msgstr "àààààà àààààààà àààààààààààà"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "ààà SS_L àààà"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "àà àààààà ààà ààààà?"
@@ -1161,6 +1124,36 @@ msgstr "àà àààààà ààààààààà ààààà?"
 msgid "What is your desired Jabber password?"
 msgstr "àààà ààààààààà àààààà ààààààààà ààààà?"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#| msgid "Nic_kname:"
+msgid "Nic_kname"
+msgstr "àààààààà (_k)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+#| msgid "_Last Name:"
+msgid "_Last Name"
+msgstr "ààààà àààà (_L)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#| msgid "_First Name:"
+msgid "_First Name"
+msgstr "ààààà àààà (_F)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#| msgid "_Published Name:"
+msgid "_Published Name"
+msgstr "àààààààààààà àààà (_P)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#| msgid "_Jabber ID:"
+msgid "_Jabber ID"
+msgstr "ààààààà ààà (_J)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+#| msgid "E-_mail address:"
+msgid "E-_mail address"
+msgstr "à-àààààà àààààààà"
+
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>àààààà:</b> user hotmail com"
@@ -1173,33 +1166,39 @@ msgstr "àà ààààààà àààà ààà àààààà
 msgid "What is your Windows Live password?"
 msgstr "àà ààààààà àààà ààààààààà ààààà?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-msgid "Nic_kname:"
-msgstr "àààààààà (_k):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:207
+#: ../libempathy-gtk/empathy-account-widget-sip.c:240
+msgid "Auto"
+msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Last Name:"
-msgstr "ààààà àààà (_L):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:210
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
-msgid "_First Name:"
-msgstr "ààààà àààà (_F):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:213
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Published Name:"
-msgstr "àààààààààààà àààà (_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "TLS"
+msgstr "TLS"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "ààààààà ààà (_J):"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:245
+msgid "Register"
+msgstr "ààààààààààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
-msgstr "à-àààààà àààààààà:"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:250
+msgid "Options"
+msgstr "ààààààààà"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:253
+msgid "None"
+msgstr "ààààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
-msgstr "ààààààààààà (_U):"
+#| msgid "_Username:"
+msgid "_Username"
+msgstr "ààààààààààà (_U)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
@@ -1222,8 +1221,9 @@ msgid "Miscellaneous Options"
 msgstr "àààààààààà àààààààààààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
-msgstr "STUN ààààà:"
+#| msgid "STUN Server:"
+msgid "STUN Server"
+msgstr "STUN ààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Discover the STUN server automatically"
@@ -1233,30 +1233,28 @@ msgstr "STUN ààààààààà àààààààààààà 
 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 "Keep-Alive Options"
 msgstr "ààààààààààààààà ààààà ààààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Mechanism:"
-msgstr "àààààààà ààààà:"
+#| msgid "Mechanism:"
+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 "àààààààààà ààààààààààà:"
+#| msgid "Authentication username:"
+msgid "Authentication username"
+msgstr "ààààààà ààààààààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-msgid "Transport:"
-msgstr "ààààààààâàààààà:"
+#| msgid "Transport:"
+msgid "Transport"
+msgstr "ààààààààâàààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "Loose Routing"
@@ -1266,13 +1264,10 @@ msgstr "àààààààààààààà ààààààààà
 msgid "Ignore TLS Errors"
 msgstr "TLS ààààààà àààààààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Port:"
-msgstr "àààààà (_P):"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Local IP Address:"
-msgstr "ààààààà IP àààààààà: "
+#| msgid "Local IP Address:"
+msgid "Local IP Address"
+msgstr "ààààààà IP àààààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
@@ -1282,6 +1277,10 @@ msgstr "àà SIP àààààà ààà ààààà?"
 msgid "What is your SIP account password?"
 msgstr "àà SIP àààà àààààààà ààààà?"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "àààààààà (_w):"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Yahoo! I_D:"
 msgstr "àààà! ààà (_D):"
@@ -1294,6 +1293,14 @@ msgstr "ààààààààààà ààààà ààààâàà
 msgid "_Room List locale:"
 msgstr "ààà àààààà àààààààà (_R):"
 
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "ààààà ààààà (_a):"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "àààààà (_P):"
+
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "àà àààà! ààà ààààà?"
@@ -1302,36 +1309,36 @@ msgstr "àà àààà! ààà ààààà?"
 msgid "What is your Yahoo! password?"
 msgstr "àà àààà! àààààààà ààààà?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:471
-#: ../libempathy-gtk/empathy-avatar-chooser.c:556
+#: ../libempathy-gtk/empathy-avatar-chooser.c:545
+#: ../libempathy-gtk/empathy-avatar-chooser.c:630
 msgid "Couldn't convert image"
 msgstr "ààààààà ààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+#: ../libempathy-gtk/empathy-avatar-chooser.c:546
 msgid "None of the accepted image formats are supported on your system"
 msgstr "àà ààààààà àààà ààààààààà à ààààà àààààààààà ààààààààààààà"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+#: ../libempathy-gtk/empathy-avatar-chooser.c:906
 msgid "Couldn't save picture to file"
 msgstr "ààààà àààà àààààààààà  àààààààà ààààà  "
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:939
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1030
 msgid "Select Your Avatar Image"
 msgstr "àà ààààààà ààààààà ààààààààà"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1038
 msgid "Take a picture..."
 msgstr "àà àààààààààà àààààà..."
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:960
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1051
 msgid "No Image"
 msgstr "ààààà àààà"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1108
 msgid "Images"
 msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1112
 msgid "All Files"
 msgstr "ààààà àààààà"
 
@@ -1339,6 +1346,35 @@ msgstr "ààààà àààààà"
 msgid "Click to enlarge"
 msgstr "àààààààààààààà àààààààà"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentification failed for account <b>%s</b>"
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "àààà <b>%s</b> ààààà ààààààà ààààààààà"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
+#: ../libempathy-gtk/empathy-chat.c:3724
+msgid "Retry"
+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 ""
+"<b>%s</b> \n"
+"àààà ààààà àà àààààààààààà àààààààààààààà"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+msgid "Select..."
+msgstr "ààààààààà..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+msgid "_Select"
+msgstr "ààààààààà_S"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
@@ -1376,64 +1412,67 @@ msgstr "à àààààà àà àààààà ààààààà
 msgid "You are not allowed to change the topic"
 msgstr "àààààààà ààààààààà àààà àààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:990
-#, c-format
-msgid "â%sâ is not a valid contact ID"
-msgstr "â%sâ ààààà ààààààà ààààààà ààà"
+#: ../libempathy-gtk/empathy-chat.c:967
+#| msgid "invalid contact"
+msgid "Invalid contact ID"
+msgstr "ààààààà àààààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1085
+#: ../libempathy-gtk/empathy-chat.c:1054
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: àààààààà àààààààààà ààààà ààààààààà àààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1088
+#: ../libempathy-gtk/empathy-chat.c:1057
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: àààààààà àààààà ààààà àààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1091
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: àà ààààà àààà ààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: àà ààààà àààà ààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1098
+#: ../libempathy-gtk/empathy-chat.c:1067
 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:1102
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: àà ààààà ààààâàà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1105
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: àà ààààà ààààâàà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1108
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: àààààààà àààààààà àà àààààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1111
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>:àààààààà àààààààà àà ACTION àààààààààà ààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1083
 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 <message> : àààààààà àààààààà <message> àààààà. à àà '/' àà àààààààà àà "
+"àààààààààà "
+"ààààààààà àààààààààààà. àààààààà: \"/ ààààààààà / àààààà àà ààààà àààà àààà "
+"ààààààààà àààààààààààà\""
 
-#: ../libempathy-gtk/empathy-chat.c:1119
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/ WHOIS <contact ID>: àà àààààààààà ààààààà àààààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1122
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,126 +1480,126 @@ msgstr ""
 "/help [<command>]: ààààààà àààà ààààà àààààààà ààààààààààà. ààààà <command> "
 "àààààààààààààààààààà, àààà ààààààà ààààààà."
 
-#: ../libempathy-gtk/empathy-chat.c:1141
+#: ../libempathy-gtk/empathy-chat.c:1110
 #, c-format
 msgid "Usage: %s"
 msgstr "ààààà: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "Unknown command"
 msgstr "ààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1312
+#: ../libempathy-gtk/empathy-chat.c:1281
 msgid "Unknown command; see /help for the available commands"
 msgstr "ààààààà àààààà; ààààààààààààààà ààààààà àààà /help àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1538
 msgid "insufficient balance to send message"
 msgstr "àààààà ààààààà ààààààà àààààààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1567 ../libempathy-gtk/empathy-chat.c:1581
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1542 ../libempathy-gtk/empathy-chat.c:1556
+#: ../libempathy-gtk/empathy-chat.c:1619
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "'%s' àààààà ààààààà ààààà: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1586
-#: ../libempathy-gtk/empathy-chat.c:1648
+#: ../libempathy-gtk/empathy-chat.c:1544 ../libempathy-gtk/empathy-chat.c:1561
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, 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:1575
+#: ../libempathy-gtk/empathy-chat.c:1550
 #, 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:1615
+#: ../libempathy-gtk/empathy-chat.c:1590
 msgid "not capable"
 msgstr "ààààààààààààà ààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1622
+#: ../libempathy-gtk/empathy-chat.c:1597
 msgid "offline"
 msgstr "àààâàààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1625
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "invalid contact"
 msgstr "ààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1628
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "permission denied"
 msgstr "àààààà ààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1631
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "too long message"
 msgstr "ààà àààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1634
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "not implemented"
 msgstr "àààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1638
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "unknown"
 msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1705 ../src/empathy-chat-window.c:919
+#: ../libempathy-gtk/empathy-chat.c:1680 ../src/empathy-chat-window.c:967
 msgid "Topic:"
 msgstr "ààààà:"
 
-#: ../libempathy-gtk/empathy-chat.c:1720
+#: ../libempathy-gtk/empathy-chat.c:1695
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ààààà àààààà ààààààààààà: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1697
 #, 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:1727
+#: ../libempathy-gtk/empathy-chat.c:1702
 msgid "No topic defined"
 msgstr "à ààààà àààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2243
+#: ../libempathy-gtk/empathy-chat.c:2218
 msgid "(No Suggestions)"
 msgstr "(à àààààà àààà)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2311
+#: ../libempathy-gtk/empathy-chat.c:2286
 #, 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:2348
+#: ../libempathy-gtk/empathy-chat.c:2323
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "'%s'àà %s àààààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2418
+#: ../libempathy-gtk/empathy-chat.c:2393
 msgid "Insert Smiley"
 msgstr "ààààààààààà àààààà"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2436
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2411
+#: ../libempathy-gtk/empathy-ui-utils.c:1180
 msgid "_Send"
 msgstr "àààà (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2493
+#: ../libempathy-gtk/empathy-chat.c:2468
 msgid "_Spelling Suggestions"
 msgstr "àààààààààà àààààà (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2582
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "Failed to retrieve recent logs"
 msgstr "àààààà ààààààààà àààààààà ààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2721
+#: ../libempathy-gtk/empathy-chat.c:2718
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ààààààààààààààà"
@@ -1568,12 +1607,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:2728
+#: ../libempathy-gtk/empathy-chat.c:2725
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s àààààà %2$s ààà ààààà àààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2731
+#: ../libempathy-gtk/empathy-chat.c:2728
 #, c-format
 msgid "%s was kicked"
 msgstr "%s àààààààààààààà"
@@ -1581,17 +1620,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:2739
+#: ../libempathy-gtk/empathy-chat.c:2736
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s ààààààà %2$s ààà ààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2742
+#: ../libempathy-gtk/empathy-chat.c:2739
 #, c-format
 msgid "%s was banned"
 msgstr "%s ààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2746
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ààààà ààààààààààààà"
@@ -1601,17 +1640,17 @@ msgstr "%s ààààà ààààààààààààà"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2755
+#: ../libempathy-gtk/empathy-chat.c:2752
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2780
+#: ../libempathy-gtk/empathy-chat.c:2777
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2805
+#: ../libempathy-gtk/empathy-chat.c:2802
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ààààààà %s ààà ààààààà"
@@ -1619,55 +1658,50 @@ 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:2992
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1466
-#: ../src/empathy-call-window.c:1516 ../src/empathy-call-window.c:2562
+#: ../libempathy-gtk/empathy-chat.c:2989 ../src/empathy-call-window.c:1467
+#: ../src/empathy-call-window.c:1517 ../src/empathy-call-window.c:2570
+#: ../src/empathy-event-manager.c:1166
 msgid "Disconnected"
 msgstr "ààààààààààààààààààà"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3656
+#: ../libempathy-gtk/empathy-chat.c:3664
 msgid "Would you like to store this password?"
 msgstr "à ààààààààààà àààààààààààààààààààààà?"
 
-#: ../libempathy-gtk/empathy-chat.c:3662
+#: ../libempathy-gtk/empathy-chat.c:3670
 msgid "Remember"
 msgstr "ààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:3672
+#: ../libempathy-gtk/empathy-chat.c:3680
 msgid "Not now"
 msgstr "ààààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:3716
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "àààà ààààààààààà"
-
-#: ../libempathy-gtk/empathy-chat.c:3720
+#: ../libempathy-gtk/empathy-chat.c:3728
 msgid "Wrong password; please try again:"
 msgstr "àààààààà ààààà; àààààà ààààà ààààààààààààà:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3850
+#: ../libempathy-gtk/empathy-chat.c:3858
 msgid "This room is protected by a password:"
 msgstr "à ààà ààààààààààà ààààà àààààààààà:"
 
-#: ../libempathy-gtk/empathy-chat.c:3877
+#: ../libempathy-gtk/empathy-chat.c:3885
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:4069 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4077 ../src/empathy-event-manager.c:1187
 msgid "Connected"
 msgstr "àààààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:4124
+#: ../libempathy-gtk/empathy-chat.c:4132
 msgid "Conversation"
 msgstr "àààààà"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4129
+#: ../libempathy-gtk/empathy-chat.c:4137
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
@@ -1692,17 +1726,16 @@ msgstr "àààààà ààààààààààààààà"
 msgid "Could not block contact"
 msgstr "àààààààààà àààààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:611
 msgid "Edit Blocked Contacts"
 msgstr "àààààààààààà ààààààààà ààààààà"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:503
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "àààà:"
 
@@ -1710,357 +1743,157 @@ msgstr "àààà:"
 msgid "Blocked Contacts"
 msgstr "àààààààààààà ààààààààà"
 
-#. 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 "ààààà àààààààààà àààààààà (_C)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:102
+msgid "Full name"
+msgstr "àààààà àààà:"
 
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:329
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "ààààààà àààààà (_O)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:103
+msgid "Phone number"
+msgstr "àààà ààààà:"
 
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:417
-msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "E-mail address"
+msgstr "à-àààààà àààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "ààààà  àààààà"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Website"
+msgstr "ààààâàààà:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "%s ààààààààààà?"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "Birthday"
+msgstr "ààààààààààà:"
 
-#: ../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' àààààà ààààààààà?"
+#. 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:111
+msgid "Last seen:"
+msgstr "ààààà àààààà:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "ààààààààà (_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:112
+msgid "Server:"
+msgstr "àààààà:"
 
-#: ../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-contactinfo-utils.c:113
+msgid "Connected from:"
+msgstr "àààà ààààà ààààààààààààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "àààà àààààààà"
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:117
+msgid "Away message:"
+msgstr "àààààà àààààààà ààààààà:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:130
+msgid "work"
+msgstr "ààà "
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:131
+msgid "home"
+msgstr "ààààâ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "mobile"
+msgstr "àààààà"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "voice"
+msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "ààààààààà ààààààààà (_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "preferred"
+msgstr "àààààààààà"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "àààààà ààààààààààààà (_L)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "postal"
+msgstr "ààààà"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "parcel"
+msgstr "àààààààà"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:496
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
 msgid "Search contacts"
 msgstr "ààààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:526
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "àààààà: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:584
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "àààààààààà àààààà...(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:602
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "à àààààààà àààààààà"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:618
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "àà àààààà ààààààààà  àààààà ààààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:626
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "àààà àààààààà àààààààààà ààààà àààààà ààààààààààà. àààààààààà!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:566
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:746
-#: ../libempathy-gtk/empathy-individual-widget.c:455
-msgid "Country ISO Code:"
-msgstr "ààààà ISO àààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:748
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:750
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "ààààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:752
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:754
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "àààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:756
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-msgstr "ààààààà àààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "àààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:760
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:762
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:764
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "ààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:766
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:768
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:770
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URI:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:772
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "ààààààààà àààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:774
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:776
-#: ../libempathy-gtk/empathy-individual-widget.c:485
-msgid "Vertical Error (meters):"
-msgstr "àààààà ààààà (ààààààà):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:778
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "àààà ààààà (ààààààà):"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:780
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:782
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:784
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "ààààà ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:786
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-msgid "Last Updated on:"
-msgstr "ààààààà àààààààààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:788
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "àààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:790
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "ààààààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:792
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:845
-#: ../libempathy-gtk/empathy-contact-widget.c:860
-#: ../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:862
-#: ../libempathy-gtk/empathy-individual-widget.c:610
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:914
-#: ../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:996
+#: ../libempathy-gtk/empathy-contact-widget.c:168
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "àààààààààà ààààààààà"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1052
+#: ../libempathy-gtk/empathy-contact-widget.c:224
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "àààààààààà ààààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1454
-msgid "Personal Details"
-msgstr "ààààààààà ààààààà"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1457
-#: ../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 "àààààà àààà:"
-
-#: ../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
+#. Setup id label
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "àààààààààààà:"
+#: ../libempathy-gtk/empathy-user-info.c:444
+#| msgid "Identifier:"
+msgid "Identifier"
+msgstr "àààààààààààà"
 
-#. Alias
+#. Setup nickname entry
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ààààààà:"
+#: ../libempathy-gtk/empathy-user-info.c:449
+#| msgid "Alias:"
+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-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "ààààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requestedâ"
 msgstr "àààààààààààààà àààààààà..."
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ààààààà</b> à (àààà)àààà\t"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Client Information"
-msgstr "àààààààà àààààààà"
+msgstr "ààààààààà àààààààà"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "OS:"
-msgstr "OS:"
+#| msgid "OS:"
+msgid "OS"
+msgstr "OS"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Version:"
-msgstr "àààààà:"
+#| msgid "Version:"
+msgid "Version"
+msgstr "àààààà"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Client:"
-msgstr "àààààààà:"
+#| msgid "Client:"
+msgid "Client"
+msgstr "ààààààààà"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
@@ -2071,7 +1904,8 @@ 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:358
@@ -2084,31 +1918,67 @@ msgid "Select"
 msgstr "ààààààààà"
 
 #: ../libempathy-gtk/empathy-groups-widget.c:403
-#: ../src/empathy-roster-window.c:1969
 msgid "Group"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "ààààà  àààààà"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:193
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "%s ààààààààààà?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:248
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "àààà ààààà àààà ààààààààààà ààààà '% s' àààààà ààààààààà?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:253
 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:260
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ààààààààààààà ààààààààà àààààààààààà:"
 msgstr[1] "ààààààààààààà ààààààààààà àààààààààààà:"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "ààààààààà (_B)"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:279
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "à ààààààà àààààààààààààààà ààààààààà (_R)"
+msgstr[1] "à ààààààà àààààààààààààààà ààààààààà (_R)"
+
 #: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "ààààà ààààààààààà ààààààà"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:293
 msgid "Linked Contacts"
 msgstr "àààà àààààààà (_O)"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+msgid "gnome-contacts not installed"
+msgstr "ààààààâ-àààààààààà ààààààààààààààà"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+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).
@@ -2117,146 +1987,264 @@ msgstr "àààà àààààààà (_O)"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:344
+#: ../libempathy-gtk/empathy-individual-menu.c:348
 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:348
+#: ../libempathy-gtk/empathy-individual-menu.c:352
 #: ../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:413
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "Mobile"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:415
+#: ../libempathy-gtk/empathy-individual-menu.c:419
 msgid "Work"
 msgstr "ààà "
 
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:421
 msgid "HOME"
 msgstr "ààààà "
 
-#: ../libempathy-gtk/empathy-individual-menu.c:658
+#: ../libempathy-gtk/empathy-individual-menu.c:662
 msgid "_Block Contact"
 msgstr "àààààààààà ààààààààà (_B)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:718
+msgid "Delete and _Block"
+msgstr "àààààààà ààààà ààààààààà (_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:780
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "àààà àààààààà '%s' àààààààààà àààààààààààààààààààààà?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:789
+#, 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-menu.c:800
+msgid "Removing contact"
+msgstr "àààààààààà ààààààààààààààà"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:864
+#: ../libempathy-gtk/empathy-individual-view.c:2453
+msgid "_Remove"
+msgstr "àààààààà (_R)"
+
 #. 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
+#: ../libempathy-gtk/empathy-individual-menu.c:1227
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "àààà (_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1052
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1262
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1085
+#: ../libempathy-gtk/empathy-individual-menu.c:1295
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ààààà àààà (_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1118
+#: ../libempathy-gtk/empathy-individual-menu.c:1328
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "àààààà àààà (_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1159
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../libempathy-gtk/empathy-individual-menu.c:1369
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "ààààààà àààààààà (_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1188
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
 msgid "Send File"
 msgstr "àààààà àààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1218
+#: ../libempathy-gtk/empathy-individual-menu.c:1428
 msgid "Share My Desktop"
 msgstr "àà ààààààâààààâàà àààààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1244
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1454
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 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:1397
+#: ../libempathy-gtk/empathy-individual-menu.c:1483
 msgid "Infor_mation"
 msgstr "àààààààà (_m)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1446
+#: ../libempathy-gtk/empathy-individual-menu.c:1532
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "àààà (_E)"
 
 #. send invitation
-#: ../libempathy-gtk/empathy-individual-menu.c:1562
-#: ../src/empathy-chat-window.c:1190
+#: ../libempathy-gtk/empathy-individual-menu.c:1648
+#: ../src/empathy-chat-window.c:1233
 msgid "Inviting you to this room"
 msgstr "ààààààààà à ààààà ààààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1608
+#: ../libempathy-gtk/empathy-individual-menu.c:1694
 msgid "_Invite to Chat Room"
 msgstr "àààà ààààà àààààààààà (_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1804
-#: ../src/empathy-roster-window-menubar.ui.h:5
+#: ../libempathy-gtk/empathy-individual-menu.c:1890
 msgid "_Add Contactâ"
 msgstr "àààààààààà àààààà...(_A)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2304
-msgid "Delete and _Block"
-msgstr "àààààààà ààààà ààààààààà (_B)"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2339
+#: ../libempathy-gtk/empathy-individual-view.c:2373
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "àààà àààààà '%s' ààààààà àààààààààààààààààààààà?"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2342
+#: ../libempathy-gtk/empathy-individual-view.c:2376
 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:2444
+#| msgid "Rename"
+msgid "Re_name"
+msgstr "àààààààààà (_n)"
 
-#: ../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-widget.c:304
+msgid "Channels:"
+msgstr "ààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:455
+msgid "Country ISO Code:"
+msgstr "ààààà ISO àààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:457
+msgid "Country:"
+msgstr "ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:459
+msgid "State:"
+msgstr "ààààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:461
+msgid "City:"
+msgstr "ààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:463
+msgid "Area:"
+msgstr "àààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:465
+msgid "Postal Code:"
+msgstr "ààààààà àààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:467
+msgid "Street:"
+msgstr "àààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:469
+msgid "Building:"
+msgstr "ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:471
+msgid "Floor:"
+msgstr "ààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:473
+msgid "Room:"
+msgstr "ààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:475
+msgid "Text:"
+msgstr "ààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:477
+msgid "Description:"
+msgstr "ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:479
+msgid "URI:"
+msgstr "URI:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:481
+msgid "Accuracy Level:"
+msgstr "ààààààààà àààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:483
+msgid "Error:"
+msgstr "ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:485
+msgid "Vertical Error (meters):"
+msgstr "àààààà ààààà (ààààààà):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:487
+msgid "Horizontal Error (meters):"
+msgstr "àààà ààààà (ààààààà):"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:489
+msgid "Speed:"
+msgstr "ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:491
+msgid "Bearing:"
+msgstr "ààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:493
+msgid "Climb Speed:"
+msgstr "ààààà ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:495
+msgid "Last Updated on:"
+msgstr "ààààààà àààààààààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:497
+msgid "Longitude:"
+msgstr "àààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:499
+msgid "Latitude:"
+msgstr "ààààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:501
+msgid "Altitude:"
+msgstr "ààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:39
+msgid "Location"
+msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"àààà àààààà ààààà àààààà '% s' ààààààààààààà àààààààààààààà? à ààààà àààààààààààà àà ààààààààà ààààà "
-"ààààààààà àààààààààààà ààààààààà."
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-msgstr "àààààààààà ààààààààààààààà"
+#: ../libempathy-gtk/empathy-individual-widget.c:659
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y at %R UTC"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "ààààààà:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "àààààààààààà:"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2296,135 +2284,160 @@ msgstr "ààààà àààààà"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:617
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"àààààààààà àààààààààààà àààààààààà ààààà àààà ààà ààààààààà ààà ààààààà "
+"àààààà àààà àààààààààà. àà "
+"àààààààààààààà àààà ààààààààà, àààààà àààààààà àààààààà ààààà àààààààà. àààà "
+"ààààààà 'àààààààà' ààààààà "
+"ààààààààà à ààààà àààààà à ààààààà àààààà àààà àààààà ààààààààààà"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:101
+msgid "People nearby"
+msgstr "ààààààààà àààààà"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:116
+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 â àààààà</span> àààààààà àààààààà"
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:672
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:694
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1145
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "%sàà  àààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1147
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "àààà àà  %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1197
-#: ../libempathy-gtk/empathy-log-window.c:1341
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A %B %d %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1284
+#: ../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:1290
+#: ../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:1365
+#: ../libempathy-gtk/empathy-log-window.c:1370
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s ààààà  "
 msgstr[1] "%s ààààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1372
+#: ../libempathy-gtk/empathy-log-window.c:1377
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s ààààààà"
 msgstr[1] "%s àààààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "àààà,% s àààààààà% s àààà ààààààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1711
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1715
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Yesterday"
 msgstr "ààààà"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1730
+#: ../libempathy-gtk/empathy-log-window.c:1735
 msgid "%e %B %Y"
 msgstr "%A %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1834
-#: ../libempathy-gtk/empathy-log-window.c:3457
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "à ààààààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1933
-#: ../libempathy-gtk/empathy-log-window.c:2392
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 msgid "Anyone"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:2705
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:2914
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3032
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3034
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Text chats"
 msgstr "ààààà àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3035
-#: ../src/empathy-preferences.ui.h:25
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "àààààà "
 
-#: ../libempathy-gtk/empathy-log-window.c:3039
+#: ../libempathy-gtk/empathy-log-window.c:3044
 msgid "Incoming calls"
 msgstr "ààààààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3045
 msgid "Outgoing calls"
 msgstr "ààààà àààààà àààààà àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3041
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Missed calls"
 msgstr "àààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3061
+#: ../libempathy-gtk/empathy-log-window.c:3066
 msgid "What"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3750
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "àààà ààààààà àààààààà ààààà ààààààà ààààààààààààà àààààààààààààààààà?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3754
+#: ../libempathy-gtk/empathy-log-window.c:3759
 msgid "Clear All"
 msgstr "àààà ààààààààà "
 
-#: ../libempathy-gtk/empathy-log-window.c:3761
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "àààà ààààà ààààààààà:"
 
@@ -2434,7 +2447,6 @@ msgstr "àààà (_F)"
 
 #: ../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)"
 
@@ -2447,13 +2459,12 @@ msgid "Profile"
 msgstr "àààààààà"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:19 ../src/empathy-preferences.ui.h:11
 msgid "Chat"
 msgstr "àààà"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:26
-#: ../src/empathy-streamed-media-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:24
 msgid "Video"
 msgstr "àààààà"
 
@@ -2465,131 +2476,125 @@ msgstr "àààà 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\"> àààà àààààààà ...</ span>ààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-account-dialog.c:129
+msgid "What kind of chat account do you have?"
+msgstr "àààà à àààà àààà àààààà ààààààààààààà?"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:151
+msgid "Adding new account"
+msgstr "ààààà àààà"
+
+#: ../libempathy-gtk/empathy-new-call-dialog.c:199
+#: ../libempathy-gtk/empathy-new-message-dialog.c:289
+msgid "Enter a contact identifier or phone number:"
+msgstr "àààààààà àààà àààà àààààâàà ààààààà"
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Video Call"
+msgstr "àààààà àààà (_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "_Audio Call"
+msgstr "ààààà àààà (_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:242
+msgid "New Call"
+msgstr "ààààà àààà"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:82
 msgid "The contact is offline"
 msgstr "ààààààà àààâàààààà àààà."
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "The specified contact is either invalid or unknown"
 msgstr "ààààààààà àààààààà àààààààààààà àààà àààà ààààààà "
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "The contact does not support this kind of conversation"
 msgstr "à àààààà àà ààààààà ààààààààà àààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "àààààààààààà ààààààààààà à àààààààààà àààà àààà àààààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Could not start a conversation with the given contact"
 msgstr "àààà àààààà àààààààààààà àààààà àààà ààààààààà "
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:96
 msgid "You are banned from this channel"
 msgstr "àààààà àààààààà àà àààààà àààààààààààà àààààà àààààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:98
 msgid "This channel is full"
 msgstr "à ààààà àààààà àààààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "You must be invited to join this channel"
 msgstr "à ààààà àà ààààààà àààà àààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 msgid "Can't proceed while disconnected"
 msgstr "ààààààààààà àààààààà ààààààààààààààààà "
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 msgid "Permission denied"
 msgstr "àààààà ààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 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:333
+#: ../libempathy-gtk/empathy-new-message-dialog.c:332
 msgid "New Conversation"
 msgstr "ààààà àààààà"
 
-#. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:223
-msgid "_Video Call"
-msgstr "àààààà àààà (_V)"
-
-#. 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:243
-msgid "New Call"
-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-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"
-"àààà ààààà àà àààààààààààà àààààààààààààà"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:166
-#: ../libempathy-gtk/empathy-presence-chooser.c:202
+#: ../libempathy-gtk/empathy-presence-chooser.c:164
+#: ../libempathy-gtk/empathy-presence-chooser.c:200
 msgid "Custom Messageâ"
 msgstr "àààààààà ààààààà..."
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:217
 #: ../libempathy-gtk/empathy-presence-chooser.c:219
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
 msgid "Edit Custom Messagesâ"
 msgstr "àààààààà ààààààààà ààààààà..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:344
+#: ../libempathy-gtk/empathy-presence-chooser.c:341
 msgid "Click to remove this status as a favorite"
 msgstr "à àààààààà ààààààààà ààààà ààààààààààà àààààààà"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:353
+#: ../libempathy-gtk/empathy-presence-chooser.c:350
 msgid "Click to make this status a favorite"
 msgstr "à àààààààà ààààààààààà ààààààà àààààààà"
 
 #. Translators: %s is a status message like 'At the pub' for example
-#: ../libempathy-gtk/empathy-presence-chooser.c:387
+#: ../libempathy-gtk/empathy-presence-chooser.c:384
 #, c-format
 msgid ""
 "<b>Current message: %s</b>\n"
 "<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
 msgstr ""
 "<b>àààààààà àààààà: %s</b>\n"
-"<small><i>ààààà àààààà ààààààà àààà ààààà àà àààààààà àààà ààààà ààààà àààà Esc àà àààààààà. </"
+"<small><i>ààààà àààààà ààààààà àààà ààààà àà àààààààà àààà ààààà ààààà àààà "
+"Esc àà àààààààà. </"
 "i></small>"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:396
+#: ../libempathy-gtk/empathy-presence-chooser.c:393
 msgid "Set status"
 msgstr "àààààààà àààààà"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1147
+#: ../libempathy-gtk/empathy-presence-chooser.c:1101
 msgid "Custom messagesâ"
 msgstr "àààààààà àààààààà..."
 
@@ -2597,11 +2602,15 @@ msgstr "àààààààà àààààààà..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#: ../libempathy-gtk/empathy-protocol-chooser.c:608
 #, c-format
 msgid "New %s account"
 msgstr "ààààà %s àààà"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "ààààààà ààààààà (_M)"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "ààààààà:"
@@ -2666,31 +2675,35 @@ msgstr "àààààà àààà ààààààààà"
 msgid "Edit Custom Messages"
 msgstr "àààààààà ààààààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "àààà àààààààà"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1104
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "àà àààààààààà% s àààààà àààààà ààààààààààààààààààà"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:729
+msgid "_Decline"
+msgstr "ààààààààààà(_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "àààààààààà (_A)"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1125
 #, c-format
 msgid "Message edited at %s"
 msgstr "àààààà% s àààà àààààààààààà"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1841
 msgid "Normal"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "ààààààààà"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "àààààà"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "ààààààààààà"
-
-#: ../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 "àààà àààààà àààààààà ààààààààà ààààààààààààààà."
@@ -2756,7 +2769,8 @@ msgstr "àààààà àààà àààààààààà "
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
-msgstr "àààààààààà àààààààààà àààà. ààà ààààààààààà àààà ààààààààààààààààààààà?"
+msgstr ""
+"àààààààààà àààààààààà àààà. ààà ààààààààààà àààà ààààààààààààààààààààà?"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
@@ -2766,32 +2780,52 @@ msgstr "ààààààààà àààààààààààà à à
 msgid "Certificate Details"
 msgstr "àààààààààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1050
 msgid "Unable to open URI"
 msgstr "URI ààààààààààààààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1174
 msgid "Select a file"
 msgstr "àà ààààâàà àààààààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1248
 msgid "Insufficient free space to save file"
 msgstr "àààààà àààààààààààà àààà àààà àààààà àààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1256
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
 "Please choose another location."
 msgstr ""
-"à àààààà àààààààààààà %s àààà àààààà àààààà, àààà ààààà %s ààààààà àààààààààà àààààà. àààààà "
+"à àààààà àààààààààààà %s àààà àààààà àààààà, àààà ààààà %s ààààààà àààààààààà "
+"àààààà. àààààà "
 "ààààà ààààààààà àààààààààà."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1302
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ààààà àààà àààààààààààààààà"
 
+#: ../libempathy-gtk/empathy-user-info.c:384
+msgid "Go online to edit your personal information."
+msgstr "àà ààààààààà àààààààààà àààààààààà àààâàààà àà àààààààà "
+
+#: ../libempathy-gtk/empathy-user-info.c:464
+#| msgid "Personal Details"
+msgid "<b>Personal Details</b>"
+msgstr "<b>ààààààààà ààààààà</b>"
+
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:278
+msgid "_Copy Link Address"
+msgstr "ààààà àààààààààà àààààààà (_C)"
+
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Open Link"
+msgstr "ààààààà àààààà (_O)"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "àààààààà àààààààà"
@@ -2959,50 +2993,14 @@ msgstr "ààààààààà"
 msgid "Vietnamese"
 msgstr "àààààààààààà"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-msgid "Select..."
-msgstr "ààààààààà..."
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-msgid "_Select"
-msgstr "ààààààààà_S"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:201
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "à ààà ààààààà àààà"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:274
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "ààààà àààààà (ààààà)"
 
-#: ../src/empathy.c:425
-msgid "Don't connect on startup"
-msgstr "ààààààà ààààààààààà àààààààààààààààà"
-
-#: ../src/empathy.c:429
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "ààààààà ààààààààààààààà ààààà àààààà àààà ààà à ààà ààààààààà àààààààà"
-
-#: ../src/empathy.c:444
-msgid "- Empathy IM Client"
-msgstr "- ààààà IM àààààààà"
-
-#: ../src/empathy.c:620
-msgid "Error contacting the Account Manager"
-msgstr "àààà ààààààààààààà ààààààààààààà ààààà"
-
-#: ../src/empathy.c:622
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"ààààààààà  àààà ààààààà ààààààà ààààààààààà àà àààà àààà. àààà àààààààà:\n"
-"\n"
-"% s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3010,8 +3008,10 @@ msgid ""
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"ààààà ààààà àà àààà ààààààâàààà; àààààà àààà àààà ààààààâàààà àààààààà ààààààààààà àààààà àààà ààààà ààààààà "
-"àààààààà  ààààààààà ààààààààà àààààààà ààààà/àààà ààààààààààà; ààààààà 2 àààààààà, àààà (àà ààààààààààà "
+"ààààà ààààà àà àààà ààààààâàààà; àààààà àààà àààà ààààààâàààà àààààààà "
+"ààààààààààà àààààà àààà ààààà ààààààà "
+"àààààààà  ààààààààà ààààààààà àààààààà ààààà/àààà ààààààààààà; ààààààà 2 "
+"àààààààà, àààà (àà ààààààààààà "
 "ààààà) ààààà àààààà ààààààà."
 
 #: ../src/empathy-about-dialog.c:85
@@ -3021,8 +3021,10 @@ msgid ""
 "FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
 "details."
 msgstr ""
-"ààààà ààààà à àààààà ààààààààààà ààààààà àààààààààààààà àààààààà ààààààààààà; àààààààààààà àààà àààà "
-"àà ààààààààà àààààààààààà àààààààààààààà ààààà àààààààà ààààààààààà àààà ààààààà àààààààààààà.  "
+"ààààà ààààà à àààààà ààààààààààà ààààààà àààààààààààààà àààààààà ààààààààààà; "
+"àààààààààààà àààà àààà "
+"àà ààààààààà àààààààààààà àààààààààààààà ààààà àààààààà ààààààààààà àààà "
+"ààààààà àààààààààààà.  "
 "ààààààà àààààààà àààà ààààà ààààààà àààààààà àààààà."
 
 #: ../src/empathy-about-dialog.c:89
@@ -3031,13 +3033,14 @@ 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:109
 msgid "An Instant Messaging client for GNOME"
-msgstr "àààààà ààààà ààààà àààààà àààààààà"
+msgstr "àààààà ààààà ààààà àààààà ààààààààà"
 
 #: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
@@ -3046,22 +3049,48 @@ msgstr ""
 "Praveen Illa <mail2ipn gmail com>, 2011\n"
 "naveen <naveen swecha net>,2012"
 
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr ""
+"à ààààààààà ààààààààààààààà; ààààà ààààààà (ààà. àààààààààààà) ààààà "
+"àààààààààààà"
+
+#: ../src/empathy-accounts.c:186
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "ààààà \"ààààààààà ààààààààà\" àààààà àààà àààà à ààààààààà ààààààààààà"
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr ""
+"ààààààààààà àààààà àààààà àààààààà (ààà, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:197
+msgid "- Empathy Accounts"
+msgstr "- ààààà àààààà"
+
+#: ../src/empathy-accounts.c:240
+msgid "Empathy Accounts"
+msgstr "ààààà àààààà"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:71
+#: ../src/empathy-accounts-dialog.c:68
 #, 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:75
+#: ../src/empathy-accounts-dialog.c:72
 msgid "Your new account has not been saved yet."
 msgstr "àà ààààà àààà àààà àààààààààààààà."
 
-#: ../src/empathy-accounts-dialog.c:404
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1267
+#: ../src/empathy-accounts-dialog.c:404 ../src/empathy-call-window.c:1267
 msgid "Connectingâ"
 msgstr "àààààààààààààààààà..."
 
@@ -3088,7 +3117,9 @@ 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 "à àààà ààààààààààààààààààà àààààààà ààà ààààààà ààà àààààààààà àààà àààààà ààààààà "
+msgstr ""
+"à àààà ààààààààààààààààààà àààààààà ààà ààààààà ààà àààààààààà àààà àààààà "
+"ààààààà "
 
 #: ../src/empathy-accounts-dialog.c:502
 msgid "Offline â Account Disabled"
@@ -3098,28 +3129,20 @@ msgstr "àààâàààà â àààà àààààà ààà
 msgid "Edit Connection Parameters"
 msgstr "àààààààà ààààààààà ààààààààà "
 
-#: ../src/empathy-accounts-dialog.c:773
-msgid "Failed to retrieve your personal information from the server."
-msgstr "àà ààààààààà ààààààààà àààààààààà ààààààààààà ààààà àààààààààà "
-
-#: ../src/empathy-accounts-dialog.c:779
-msgid "Go online to edit your personal information."
-msgstr "àà ààààààààà àààààààààà àààààààààà àààâàààà àà àààààààà "
-
-#: ../src/empathy-accounts-dialog.c:866
+#: ../src/empathy-accounts-dialog.c:733
 msgid "_Edit Connection Parameters..."
 msgstr "àààààààà ààààààààà ààààààààà_E"
 
-#: ../src/empathy-accounts-dialog.c:1362
+#: ../src/empathy-accounts-dialog.c:1266
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ààààààààà ààààà %s àà àààààààààààààààààààààààà?"
 
-#: ../src/empathy-accounts-dialog.c:1366
+#: ../src/empathy-accounts-dialog.c:1270
 msgid "This will not remove your account on the server."
 msgstr "ààà àà àààààà àààààà ààààà àààààààààààààà."
 
-#: ../src/empathy-accounts-dialog.c:1571
+#: ../src/empathy-accounts-dialog.c:1475
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3128,24 +3151,24 @@ msgstr ""
 "ààààààààààààà. àààà ààààààààà ààààààààààààààààààààà?"
 
 #. Menu item: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1762
+#: ../src/empathy-accounts-dialog.c:1666
 msgid "_Enabled"
 msgstr "ààààààààà (_E) "
 
 #. Menu item: Rename
-#: ../src/empathy-accounts-dialog.c:1785
+#: ../src/empathy-accounts-dialog.c:1689
 msgid "Rename"
 msgstr "àààà àààààààà "
 
-#: ../src/empathy-accounts-dialog.c:2201
+#: ../src/empathy-accounts-dialog.c:2105
 msgid "_Skip"
 msgstr "ààààààà_S"
 
-#: ../src/empathy-accounts-dialog.c:2205
+#: ../src/empathy-accounts-dialog.c:2109
 msgid "_Connect"
 msgstr "àààààààààààààà_C"
 
-#: ../src/empathy-accounts-dialog.c:2384
+#: ../src/empathy-accounts-dialog.c:2288
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3153,6 +3176,11 @@ msgstr ""
 "àààà ààààààà ààààààààààààààààà, ààà àà ààààààààà ààààààààààààà.\n"
 "àààà ààààààààààààààààààààà?"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2431
+msgid "Messaging and VoIP Accounts"
+msgstr "àààààààà ààààà VoIP àààààà"
+
 #: ../src/empathy-accounts-dialog.ui.h:3
 msgid "_Importâ"
 msgstr "ààààààààààà...(_I)"
@@ -3166,192 +3194,231 @@ msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr ""
-"ààààà àààààà ààààààààà, àààà àààààààààààààààààààà ààààà ààààààààààâàà àààà àààààààààâàà ààààààààààà."
+"ààààà àààààà ààààààààà, àààà àààààààààààààààààààà ààààà ààààààààààâàà àààà "
+"àààààààààâàà ààààààààààà."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "No protocol backends installed"
 msgstr "àààààààààà ààààà ààààààà àààààààà  ààààààààààààààà"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:296
 msgid " - Empathy authentication client"
-msgstr "- ààààà ààààààààààà àààààààà"
+msgstr "- ààààà ààààààà ààààààààà"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:312
 msgid "Empathy authentication client"
-msgstr "ààààà ààààààààààà àààààààà"
+msgstr "ààààà ààààààà ààààààààà"
 
-#: ../src/empathy-av.c:115 ../src/empathy-call.c:198
-msgid "- Empathy Audio/Video Client"
-msgstr "- ààààà ààààà/àààààà àààààààà"
+#: ../src/empathy.c:427
+msgid "Don't connect on startup"
+msgstr "ààààààà ààààààààààà àààààààààààààààà"
 
-#: ../src/empathy-av.c:131 ../src/empathy-call.c:220
-msgid "Empathy Audio/Video Client"
-msgstr "ààààà ààààà/àààààà àààààààà"
+#: ../src/empathy.c:431
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "ààààààà ààààààààààààààà ààààà àààààà àààà ààà à ààà ààààààààà àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:434
-msgid "Contrast"
-msgstr "ààààà"
+#: ../src/empathy.c:447
+msgid "- Empathy IM Client"
+msgstr "- ààààà IM ààààààààà"
+
+#: ../src/empathy.c:623
+msgid "Error contacting the Account Manager"
+msgstr "àààà ààààààààààààà ààààààààààààà ààààà"
+
+#: ../src/empathy.c:625
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"ààààààààà  àààà ààààààà ààààààà ààààààààààà àà àààà àààà. àààà àààààààà:\n"
+"\n"
+"% s"
+
+#: ../src/empathy-call.c:193
+msgid "- Empathy Audio/Video Client"
+msgstr "- ààààà ààààà/àààààà ààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "àààààààà"
+#: ../src/empathy-call.c:217
+msgid "Empathy Audio/Video Client"
+msgstr "ààààà ààààà/àààààà ààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "àààà"
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr ""
+"%s ààààààà àààà ààààààààà ààààààààààààà, àààà àààà àààà àààà àààà ààààààà."
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "ààààààààààà"
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
+msgid "i"
+msgstr " àààà"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "àààà ààààà(_S)"
+#: ../src/empathy-call-window.c:1484 ../src/empathy-event-manager.c:508
+msgid "Incoming call"
+msgstr "ààààààààààà àààà"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "ààààà àààâàààà"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "%s ààààà àààààà àààà àààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1123
-msgid "Video input"
-msgstr "àààààà àààâàààà"
+#: ../src/empathy-call-window.c:1490 ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:913
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s ààààà àààààà àààà àààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "ààààâàààààà"
+#: ../src/empathy-call-window.c:1494
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "ààààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "ààààààà"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:202
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer"
+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:1211
 #: ../src/empathy-call-window.c:1861
 #, c-format
 msgid "Call with %s"
 msgstr "%sàà àààà àààà"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2105
+#: ../src/empathy-call-window.c:2113
 msgid "The IP address as seen by the machine"
 msgstr "ààààààààà ààààààà IP àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2107
+#: ../src/empathy-call-window.c:2115
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ààààààààààà àà àààààààà ààààààà IP àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2109
+#: ../src/empathy-call-window.c:2117
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ààà ààààà àààààààà àààà ààààà IP àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2111
+#: ../src/empathy-call-window.c:2119
 msgid "The IP address of a relay server"
 msgstr "àààà àààààà ààààà IP àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2113
+#: ../src/empathy-call-window.c:2121
 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
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2522 ../src/empathy-call-window.c:2523
+#: ../src/empathy-call-window.c:2524 ../src/empathy-call-window.c:2525
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "ààààààà"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2868
+msgid "On hold"
+msgstr "àà ààà"
+
+#: ../src/empathy-call-window.c:2870
+msgid "Mute"
+msgstr "ààààààà"
+
+#: ../src/empathy-call-window.c:2872
+msgid "Duration"
+msgstr "àààààà"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2875
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "ààààààààààààààààà â %d:%02dm"
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2964
+#: ../src/empathy-call-window.c:2971
 msgid "Technical Details"
 msgstr "àààààààà ààààààà"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3003
+#: ../src/empathy-call-window.c:3010
 #, 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:2242
-#: ../src/empathy-call-window.c:3008
+#: ../src/empathy-call-window.c:3015
 #, 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:2248
-#: ../src/empathy-call-window.c:3014
+#: ../src/empathy-call-window.c:3021
 #, 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:2254
-#: ../src/empathy-call-window.c:3020
+#: ../src/empathy-call-window.c:3027
 msgid "There was a failure on the network"
 msgstr "ààààâààààà àààà àààààààà àààààà"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3024
+#: ../src/empathy-call-window.c:3031
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "à ààààâàà ààààààà ààààà àààààààààà àà àààààààààâàà ààààààààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3027
+#: ../src/empathy-call-window.c:3034
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "à ààààâàà ààààààà àààààà àààààààààà àà àààààààààâàà ààààààààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3039
+#: ../src/empathy-call-window.c:3046
 #, 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> ààààà "
+"ààààààà ààà àà Telepathy àààà àà àààààààà. àààààà <a href=\"%s\"> à ààà "
+"ààààààà </ a> ààààà "
 "ààààà àààà àà 'ààààà' ààààà ààààà ààààààààà ààààààà ààààà."
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3055
 msgid "There was a failure in the call engine"
 msgstr "àààà ààààààà àà àààààààà àààààà"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3051
+#: ../src/empathy-call-window.c:3058
 msgid "The end of the stream was reached"
 msgstr "àààààààà àààààà ààààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3091
+#: ../src/empathy-call-window.c:3098
 msgid "Can't establish audio stream"
 msgstr "ààààà ààààààààààà àààààààààààààààààà"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3101
+#: ../src/empathy-call-window.c:3108
 msgid "Can't establish video stream"
 msgstr "àààààà ààààààààààà àààààààààààààààààà"
 
+#: ../src/empathy-call-window.c:3145
+#, c-format
+msgid "Your current balance is %s."
+msgstr "àà ààààà ààààààà %s"
+
+#: ../src/empathy-call-window.c:3149
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "àààà àààààààààààà àààààààààà ààààààà àààà "
+
+#: ../src/empathy-call-window.c:3151
+msgid "Top Up"
+msgstr "àààà ààà..."
+
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "àààà (_C)"
 
@@ -3368,23 +3435,18 @@ msgid "_Settings"
 msgstr "ààààààà (_S)"
 
 #: ../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 "ààààààà (_V)"
 
 #: ../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-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-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "ààààà (_D)"
 
@@ -3405,12 +3467,10 @@ msgid "Disable camera"
 msgstr "àààààà àààààààààà"
 
 #: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:2
 msgid "Hang up"
 msgstr "ààààà àààà"
 
 #: ../src/empathy-call-window.ui.h:15
-#: ../src/empathy-streamed-media-window.ui.h:9
 msgid "Hang up current call"
 msgstr "àààààààà ààààâàà ààààà àààà"
 
@@ -3435,69 +3495,68 @@ msgid "Display the dialpad"
 msgstr "ààààààà  àààààààà"
 
 #: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "àààààààà àààà "
-
-#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle video transmission"
 msgstr "àààààààà àààààà àààààà"
 
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Send Audio"
-msgstr "ààààààà àààà"
-
-#: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-streamed-media-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:23
 msgid "Toggle audio transmission"
 msgstr "àààààààà ààààà àààààà"
 
-#: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-streamed-media-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:25
 msgid "Encoding Codec:"
 msgstr "àààààààààà àààààà:"
 
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2514 ../src/empathy-call-window.c:2515
-#: ../src/empathy-call-window.c:2516 ../src/empathy-call-window.c:2517
-msgid "Unknown"
-msgstr "ààààààà"
-
-#: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:22
+#: ../src/empathy-call-window.ui.h:27
 msgid "Decoding Codec:"
 msgstr "ààààààààà àààààà:"
 
-#: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:28
 msgid "Remote Candidate:"
 msgstr "àààààà àààààààà:"
 
-#: ../src/empathy-call-window.ui.h:31
-#: ../src/empathy-streamed-media-window.ui.h:24
+#: ../src/empathy-call-window.ui.h:29
 msgid "Local Candidate:"
 msgstr "ààààààà àààààààà:"
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:30 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "ààààà"
 
-#: ../src/empathy-chat-window.c:288
+#: ../src/empathy-chat.c:104
+msgid "- Empathy Chat Client"
+msgstr "- ààààà àààà ààààààààà"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "àààà"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "ààà"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "ààààà-ààààààààà"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "ààààààà àààààà àààààààààà"
+
+#: ../src/empathy-chat-window.c:280
 msgid "Close this window?"
 msgstr "à ààààààà àààààà?"
 
-#: ../src/empathy-chat-window.c:293
+#: ../src/empathy-chat-window.c:286
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr ""
-"àààà ààààà ààààààààààààà à ààààààà àààààà %s. ààààààà ààààààààà àààà àààààààààààà àààà "
+"àààà ààààà ààààààààààààà à ààààààà àààààà %s. ààààààà ààààààààà àààà "
+"àààààààààààà àààà "
 "ààààààààà"
 
-#: ../src/empathy-chat-window.c:304
+#: ../src/empathy-chat-window.c:299
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3506,72 +3565,75 @@ 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 àààà àààààà  àààààà. ààààààà ààààààààà àààà àààààààààààà àààà "
+"àààà ààààà ààààààààààààà %u àààà àààààà  àààààà. ààààààà ààààààààà àààà "
+"àààààààààààà àààà "
 "ààààààààà "
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:310
 #, c-format
 msgid "Leave %s?"
 msgstr "%s àààààà ?"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:312
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr ""
-"àààà àààà ààààààààà à àààà ààà ààààà  ààààààà ààààààààà àààà àààààààà àààà àààà ààààààààà"
+"àààà àààà ààààààààà à àààà ààà ààààà  ààààààà ààààààààà àààà àààààààà àààà "
+"àààà ààààààààà"
 
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:331
 msgid "Close window"
 msgstr "ààààààà àààààà "
 
-#: ../src/empathy-chat-window.c:333
+#: ../src/empathy-chat-window.c:331
 msgid "Leave room"
 msgstr "ààààà àààààà "
 
-#: ../src/empathy-chat-window.c:639 ../src/empathy-chat-window.c:659
+#: ../src/empathy-chat-window.c:665 ../src/empathy-chat-window.c:688
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d àààààààà)"
 msgstr[1] "%s (%d àààààààà)"
 
-#: ../src/empathy-chat-window.c:651
+#: ../src/empathy-chat-window.c:680
 #, 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:667
+#: ../src/empathy-chat-window.c:696
 #, 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:676
+#: ../src/empathy-chat-window.c:705
 #, 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:891
+#: ../src/empathy-chat-window.c:942
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:901
+#: ../src/empathy-chat-window.c:950
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "%d ààààààààà ààààààààààà"
 msgstr[1] "%d ààààààààà ààààààààààà"
 
-#: ../src/empathy-chat-window.c:923
+#: ../src/empathy-chat-window.c:970
 msgid "Typing a message."
 msgstr "àà ààààààààà àààà àààààààààààà."
 
@@ -3631,116 +3693,167 @@ msgstr "ààààààâàà ààààààààà ààààà
 msgid "Move Tab _Right"
 msgstr "ààààààâàà àààààààààà ààààà (_R)"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Detach Tab"
-msgstr "ààààààâàà àààààààà (_D)"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "ààààààâàà àààààààà (_D)"
+
+#: ../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-debug-window.c:1599
+msgid "Save"
+msgstr "àààààààà"
+
+#: ../src/empathy-debug-window.c:1659
+msgid "Pastebin link"
+msgstr "àààààà ààààà "
+
+#: ../src/empathy-debug-window.c:1668
+msgid "Pastebin response"
+msgstr "àààààà ààààààààààà "
+
+#: ../src/empathy-debug-window.c:1675
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+"ààààààà ààààààààààà àà ààààààà ààààààààà ààààààà. àààààà àààààà àà àààà "
+"àààààààà "
+
+#: ../src/empathy-debug-window.c:1856
+msgid "Debug Window"
+msgstr "ààààààààà ààààà"
+
+#: ../src/empathy-debug-window.c:1916
+msgid "Send to pastebin"
+msgstr "àààààààà ààààààààà "
+
+#: ../src/empathy-debug-window.c:1960
+msgid "Pause"
+msgstr "àààààààààà"
+
+#: ../src/empathy-debug-window.c:1972
+msgid "Level "
+msgstr "àààààà "
+
+#: ../src/empathy-debug-window.c:1991
+msgid "Debug"
+msgstr "ààààààààà"
+
+#: ../src/empathy-debug-window.c:1996
+msgid "Info"
+msgstr "àààààààà"
+
+#: ../src/empathy-debug-window.c:2001 ../src/empathy-debug-window.c:2050
+msgid "Message"
+msgstr "ààààààà"
+
+#: ../src/empathy-debug-window.c:2006
+msgid "Warning"
+msgstr "àààààààà"
+
+#: ../src/empathy-debug-window.c:2011
+msgid "Critical"
+msgstr "àààààààààà"
+
+#: ../src/empathy-debug-window.c:2016
+msgid "Error"
+msgstr "ààààà"
+
+#: ../src/empathy-debug-window.c:2035
+msgid "Time"
+msgstr "àààà"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "àààà"
+#: ../src/empathy-debug-window.c:2038
+msgid "Domain"
+msgstr "àààààà"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "ààà"
+#: ../src/empathy-debug-window.c:2041
+msgid "Category"
+msgstr "àààààà"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "ààààà-ààààààààà"
+#: ../src/empathy-debug-window.c:2044
+msgid "Level"
+msgstr "àààààà"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "ààààààà àààààà àààààààààà"
+#: ../src/empathy-debug-window.c:2073
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+"ààààààààà àààààààà àààààààààà àààààà ààààààààààààà ààààààààààà ààààààààààààà."
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-event-manager.c:508
 msgid "Incoming video call"
 msgstr "ààààààààààà àààààà àààà"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1483
-msgid "Incoming call"
-msgstr "ààààààààààà àààà"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:512
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s àààà àààààà àààà àààààààààààà, àààà àààààààààààààààààààààààààà?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:513
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s àààà àààà àààààààààààà. àààà àààààààààààààààààààààààààà?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1489
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s ààààà àààààà àààà àààààààààà"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:541
 msgid "_Reject"
 msgstr "ààààààààààà (_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:549 ../src/empathy-event-manager.c:557
 msgid "_Answer"
 msgstr "ààààààààààààà (_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:557
 msgid "_Answer with video"
 msgstr "àààààààà ààààààààààà (_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1489
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "%s ààààà àààààà àààà àààààààààà"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:712
 msgid "Room invitation"
 msgstr "ààà àààààààà"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:714
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s àà ààààààà ààààààà"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:721
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s àààààààà %sàà ààààààà ààààààààààààààààà"
 
-#: ../src/empathy-event-manager.c:854
-msgid "_Decline"
-msgstr "ààààààààààà(_D)"
-
-#: ../src/empathy-event-manager.c:859
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
+#: ../src/empathy-event-manager.c:734
 msgid "_Join"
 msgstr "àààà (_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ààààààààà %sàààà ààààààà àààààààààààà"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:766
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "%s àà ààààààà àààà àààààààààààààààà"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:945
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ààààà àààààààààà àààà àààààààà"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:373
+#: ../src/empathy-event-manager.c:973 ../src/empathy-roster-window.c:225
 msgid "Password required"
 msgstr "àààààààà ààààà"
 
-#: ../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:1222
+#: ../src/empathy-event-manager.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -3869,7 +3982,8 @@ msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr ""
-"ààààààà ààààààà à àààààà àààààààààààààààà. ààààà ààààààààà ààààààà àààààààà ààààà ààààààà ààààààà "
+"ààààààà ààààààà à àààààà àààààààààààààààà. ààààà ààààààààà ààààààà àààààààà "
+"ààààà ààààààà ààààààà "
 "ààààààà àààààààààààà."
 
 #: ../src/empathy-import-dialog.c:209
@@ -3877,190 +3991,45 @@ msgid "Import Accounts"
 msgstr "ààààààà ààààààààààà"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:303
+#: ../src/empathy-import-widget.c:302
 msgid "Import"
 msgstr "ààààààààààà"
 
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:311
 msgid "Protocol"
 msgstr "àààààààààà"
 
-#: ../src/empathy-import-widget.c:336
+#: ../src/empathy-import-widget.c:335
 msgid "Source"
 msgstr "ààààà"
 
-#: ../src/empathy-roster-window.c:390
-msgid "Provide Password"
-msgstr "àààààààààààà àààààààà"
-
-#: ../src/empathy-roster-window.c:396
-msgid "Disconnect"
-msgstr "ààààààààààààà"
-
-#: ../src/empathy-roster-window.c:656
-msgid "You need to setup an account to see contacts here."
-msgstr "àààà ààààà àààààààààà àààààààààà àààààà ààààààààààà"
-
-#: ../src/empathy-roster-window.c:672
-msgid "No match found"
-msgstr "àààààààààà àààààààà"
-
-#: ../src/empathy-roster-window.c:782
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr "àààààààààà, àààà %sàààààà àààà ààààààààààààà %s àààà àààààààà ààààààà  "
-
-#: ../src/empathy-roster-window.c:848
-msgid "Update software..."
-msgstr "àààààà àààà àààààààààà..."
-
-#: ../src/empathy-roster-window.c:854 ../src/empathy-roster-window.c:971
-msgid "Close"
-msgstr "àààààààà"
-
-#: ../src/empathy-roster-window.c:959
-msgid "Reconnect"
-msgstr "àààààà àààààààààààà"
-
-#: ../src/empathy-roster-window.c:965
-msgid "Edit Account"
-msgstr "àààààà ààààààà"
-
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1109
-#, c-format
-msgid "Top up %s (%s)..."
-msgstr "àààà ààà %s (%s)..."
-
-#: ../src/empathy-roster-window.c:1155
-msgid "Top up account credit"
-msgstr "àààà ààà àààà àààààààà"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1227
-msgid "Top Up..."
-msgstr "àààà ààà..."
-
-#: ../src/empathy-roster-window.c:1951
-msgid "Contact"
-msgstr "àààààààà"
-
-#: ../src/empathy-roster-window.c:2149
-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:2157
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr "àààà àààààà àààààààààà àààààà ààààààààààààà %s"
-
-#: ../src/empathy-roster-window.c:2459
-msgid "Contact List"
-msgstr "àààààààà àààààà"
-
-#: ../src/empathy-roster-window.ui.h:1
-msgid "Account settings"
-msgstr "ààààà ààààààà "
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversationâ"
-msgstr "ààààà àààààà...(_N)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Callâ"
-msgstr "ààààà àààà...(_C)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:6
-msgid "_Search for Contactsâ"
-msgstr "ààààààà àààà àààààà...(_S)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:7
-msgid "_File Transfers"
-msgstr "àààà ààààààà (_F)"
-
-#: ../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-roster-window-menubar.ui.h:14
-msgid "_Blocked Contacts"
-msgstr "àààààààààààà àààààààà (_O)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:15
-msgid "P_references"
-msgstr "àààààààààààà (_r)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:16
-msgid "Find in Contact _List"
-msgstr "àààààààà àààààààà àààààà (_L)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:18
-msgid "Sort by _Name"
-msgstr "àààààà ààààà ààààààààààààààà (_N)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:19
-msgid "Sort by _Status"
-msgstr "àààààààà ààààà ààààààààààààààà (_S)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:20
-msgid "Normal Size With _Avatars"
-msgstr "àààààààààà àààààà àààààààà (_A)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:21
-msgid "N_ormal Size"
-msgstr "àààààà àààààààà (_o)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:22
-msgid "_Compact Size"
-msgstr "àààààààààà ààààààà (_C)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:23
-msgid "_Room"
-msgstr "ààà (_R)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:24
-msgid "_Joinâ"
-msgstr "àààà...(_J)"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "ààààààààààà àààààààààà"
 
-#: ../src/empathy-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "ààààààààààà àààà (_F)"
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "àààààààààà ààààààààààààà àà àààààààààà àààààààààà:"
 
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "ààààààààààà àààààààààà"
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "àààààààààà"
 
-#: ../src/empathy-new-chatroom-dialog.c:369
+#: ../src/empathy-new-chatroom-dialog.c:194
 msgid "Chat Room"
 msgstr "àààà ààà"
 
-#: ../src/empathy-new-chatroom-dialog.c:385
+#: ../src/empathy-new-chatroom-dialog.c:209
 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:636
+#: ../src/empathy-new-chatroom-dialog.c:410
+#| msgid "Failed to retrieve recent logs"
+msgid "Failed to list rooms"
+msgstr "àààààà àààààà ààààààà ààààààà"
+
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
 msgid ""
 "%s\n"
@@ -4073,602 +4042,719 @@ msgstr ""
 "ààààààààà ààààà: %s\n"
 "ààààààà: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
-#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "Yes"
 msgstr "ààààà"
 
-#: ../src/empathy-new-chatroom-dialog.c:638
-#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
 msgid "No"
 msgstr "àààà"
 
-#: ../src/empathy-new-chatroom-dialog.c:666
-msgid "Could not start room listing"
-msgstr "ààà ààààààààààà àààààààààààààààààààà"
-
-#: ../src/empathy-new-chatroom-dialog.c:676
-msgid "Could not stop room listing"
-msgstr "ààà ààààààààààà àààààààààààà"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.c:784
 msgid "Join Room"
 msgstr "ààààà àààà"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "ààààà ààààààà ààà àààààà àààààààààààààà àààà àààààààààà àààà àààà àààààà àààà àà àààààààà."
+msgstr ""
+"ààààà ààààààà ààà àààààà àààààààààààààà àààà àààààààààà àààà àààà àààààà àààà "
+"àà àààààààà."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "ààà (_R):"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#| msgid ""
+#| "Enter the server which hosts the room, or leave it empty if the room is "
+#| "on the current account's server"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"ààààà àààààààààààà ààààààà àààààààààààààà, àààà ààààà ààà àààààààà àààà "
+"ààààààà àààà àààààà ààààààààààà"
+
+#: ../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:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "àààààà (_S):"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Couldn't load room list"
 msgstr "ààà àààààààà àààà ààààààààààààà"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "ààà àààààà"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-notifications-approver.c:188
+msgid "Respond"
+msgstr "ààààààààà"
+
+#: ../src/empathy-notifications-approver.c:207
+msgid "Answer with video"
+msgstr "àààààà àà ààààààà"
+
+#: ../src/empathy-notifications-approver.c:215
+#: ../src/empathy-notifications-approver.c:225
+msgid "Decline"
+msgstr "àààààààààà"
+
+#: ../src/empathy-notifications-approver.c:219
+#: ../src/empathy-notifications-approver.c:230
+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:240
+msgid "Provide"
+msgstr "àààààààà"
+
+#: ../src/empathy-preferences.c:143
 msgid "Message received"
 msgstr "àààààà ààààààààààààààà"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:144
 msgid "Message sent"
 msgstr "àààààà ààààààààà"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:145
 msgid "New conversation"
 msgstr "ààààà àààààà"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:146
 msgid "Contact comes online"
 msgstr "àààààà àààâààààâàà ààààààààà"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:147
 msgid "Contact goes offline"
 msgstr "àààààà àààâàààààà ààààààààà"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:148
 msgid "Account connected"
 msgstr "àààà ààààààààààààààààà"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:149
 msgid "Account disconnected"
 msgstr "àààà àààààààààààààààààà"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:386
 msgid "Language"
 msgstr "ààà"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:724
+#: ../src/empathy-preferences.c:637
 msgid "Juliet"
 msgstr "ààààààà"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:731
+#: ../src/empathy-preferences.c:644
 msgid "Romeo"
 msgstr "àààààà"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:737
+#: ../src/empathy-preferences.c:650
 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:654
 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:657
 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:660
 msgid "And I'll no longer be a Capulet."
 msgstr "àààà ààààà àà Capulet ààààà."
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:663
 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:666
 msgid "Juliet has disconnected"
 msgstr "ààààààà àààààààààààààààà"
 
-#: ../src/empathy-preferences.c:1157
+#: ../src/empathy-preferences.c:1032
 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)"
+#| msgid "Show contact groups"
+msgid "Show groups"
+msgstr "àààààààà àààà"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "ààààààààààààà"
+#| msgid "Show the accounts dialog"
+msgid "Show account balances"
+msgstr "ààààà àààààààà àààà"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2108
+msgid "Contact List"
+msgstr "àààààààà àààààà"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "àààà àà ààààààààààà "
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
 msgstr "ààààààà ta_bs"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
 msgstr "ààààààà  ààààà_w"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Display incoming events in the notification area"
-msgstr "ààààààààààà àààààà ààààààà àààààààààà ààààààà"
-
 #: ../src/empathy-preferences.ui.h:8
-msgid "_Automatically connect on startup"
-msgstr "ààààààà ààààààààààààààà àààààààààààà ààààààààààààà (_A)"
+msgid "Show _smileys as images"
+msgstr "àààààààààààà àààààà ààà ààààààà (_s)"
 
 #: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "àààààà ààààà àààààààà ààààààà (_l)"
+
+#: ../src/empathy-preferences.ui.h:10
 msgid "Log conversations"
 msgstr "ààààààà àààààà"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:12
+msgid "Display incoming events in the notification area"
+msgstr "ààààààààààà àààààà ààààààà àààààààààà ààààààà"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "_Automatically connect on startup"
+msgstr "ààààààà ààààààààààààààà àààààààààààà ààààààààààààà (_A)"
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "Behavior"
 msgstr "àààààààà"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:15
 msgid "General"
 msgstr "àààààà"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:16
 msgid "_Enable bubble notifications"
 msgstr "àààà ààààààààà ààààààààà (_E)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:17
 msgid "Disable notifications when _away or busy"
 msgstr "àààààà àààààààààààààààààà ààààààààà àààààààààà (_a)"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:18
 msgid "Enable notifications when the _chat is not focused"
 msgstr "àààà àà ààààààààààààààààààà ààààààààà ààààààààà (_c)"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:19
 msgid "Enable notifications when a contact comes online"
 msgstr "ààààààà àààâàààààà àààààààààààà ààààààààà ààààààààà"
 
-#: ../src/empathy-preferences.ui.h:16
+#: ../src/empathy-preferences.ui.h:20
 msgid "Enable notifications when a contact goes offline"
 msgstr "àààààà àààâààààâàà ààààààààààààà ààààààààà ààààààààà"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:21
 msgid "Notifications"
 msgstr "àààààààà"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:22
 msgid "_Enable sound notifications"
 msgstr "àààààà ààààààààà ààààààààà (_E)"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:23
 msgid "Disable sounds when _away or busy"
 msgstr "àààààà àààà àààààààààààààà ààààààààà àààààààààà (_a)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:24
 msgid "Play sound for events"
 msgstr "àààà ààààà àààààààà àààààààà"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:25
 msgid "Sounds"
 msgstr "àààààààà"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:26
 msgid "Use _echo cancellation to improve call quality"
 msgstr "àààà àààààààà àààààààà echo cancellation àààààà _e"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Echo cancellation helps to make your voice sound clearer to the other "
 "person, but may cause problems on some computers. If you or the other person "
 "hear strange noises or glitches during calls, try turning echo cancellation "
 "off and restarting the call."
 msgstr ""
-"àààààààààà ààààà ààà ààààààà àà àààààà ààààà àààààààààà ààààààààà àààààààààààà, àààà àààààà àààààààààààà "
-"ààààààà ààààà ààààààà. àààà àààà ààà ààààààà àààààà àààààà àààà àààààààà àààà àààààààààà ààààààààà àààà, "
-"àààààààààà ààààà ààà ààààààààààà ààààà àààà ààààà àààààààààààààààà ààààààààààààà."
+"àààààààààà ààààà ààà ààààààà àà àààààà ààààà àààààààààà ààààààààà "
+"àààààààààààà, àààà àààààà àààààààààààà "
+"ààààààà ààààà ààààààà. àààà àààà ààà ààààààà àààààà àààààà àààà àààààààà àààà "
+"àààààààààà ààààààààà àààà, "
+"àààààààààà ààààà ààà ààààààààààà ààààà àààà ààààà àààààààààààààààà "
+"ààààààààààààà."
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Publish location to my contacts"
 msgstr "ààààààààà àà àààààààààà àààààààààà (_P)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:31
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"ààààààà ààààààààààààà ààààààààà ààà àà ààààààà, ààààààààà ààààà ààààà àààà àààààà àààààààààà "
+"ààààààà ààààààààààààà ààààààààà ààà àà ààààààà, ààààààààà ààààà ààààà àààà "
+"àààààà àààààààààà "
 "ààààààààààààà.  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
+#: ../src/empathy-preferences.ui.h:33
 msgid "_Reduce location accuracy"
 msgstr "ààààààà ààààààààààààà àààààààà (_R)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:34
 msgid "Privacy"
 msgstr "àààààà"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:35
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:36
 msgid "_Cellphone"
 msgstr "ààààâàààà (_C)"
 
-#: ../src/empathy-preferences.ui.h:33
+#: ../src/empathy-preferences.ui.h:37
 msgid "_Network (IP, Wi-Fi)"
 msgstr "ààààâààààà (IP, Wi-Fi) (_N)"
 
-#: ../src/empathy-preferences.ui.h:34
+#: ../src/empathy-preferences.ui.h:38
 msgid "Location sources:"
 msgstr "ààààà àààààà:"
 
-#: ../src/empathy-preferences.ui.h:36
+#: ../src/empathy-preferences.ui.h:40
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "àààà à àààààààà àà àààààààààà ààààààààààà à àààà ààààà àààààà ààààààà ààààààààààààààààà."
+msgstr ""
+"àààà à àààààààà àà àààààààààà ààààààààààà à àààà ààààà àààààà ààààààà "
+"ààààààààààààààààà."
 
-#: ../src/empathy-preferences.ui.h:37
+#: ../src/empathy-preferences.ui.h:41
 msgid "Enable spell checking for languages:"
 msgstr "à àààààà ààààààààà àààààààààààà ààààààààà:"
 
-#: ../src/empathy-preferences.ui.h:38
+#: ../src/empathy-preferences.ui.h:42
 msgid "Spell Checking"
 msgstr "ààààààààà ààààà"
 
-#: ../src/empathy-preferences.ui.h:39
+#: ../src/empathy-preferences.ui.h:43
 msgid "Chat Th_eme:"
 msgstr "àààà àààà (_e):"
 
-#: ../src/empathy-preferences.ui.h:40
+#: ../src/empathy-preferences.ui.h:44
 msgid "Variant:"
 msgstr "àààààààà:"
 
-#: ../src/empathy-preferences.ui.h:41
+#: ../src/empathy-preferences.ui.h:45
 msgid "Themes"
 msgstr "àààààà"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "Status"
-msgstr "àààààà"
+#: ../src/empathy-roster-window.c:242
+msgid "Provide Password"
+msgstr "àààààààààààà àààààààà"
+
+#: ../src/empathy-roster-window.c:248
+msgid "Disconnect"
+msgstr "ààààààààààààà"
+
+#: ../src/empathy-roster-window.c:442
+msgid "You need to setup an account to see contacts here."
+msgstr "àààà ààààà àààààààààà àààààààààà àààààà ààààààààààà"
+
+#: ../src/empathy-roster-window.c:518
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr ""
+"àààààààààà, àààà %sàààààà àààà ààààààààààààà %s àààà àààààààà ààààààà  "
+
+#: ../src/empathy-roster-window.c:636
+msgid "Update software..."
+msgstr "àààààà àààà àààààààààà..."
+
+#: ../src/empathy-roster-window.c:642
+msgid "Reconnect"
+msgstr "àààààà àààààààààààà"
+
+#: ../src/empathy-roster-window.c:646
+msgid "Edit Account"
+msgstr "àààààà ààààààà"
+
+#: ../src/empathy-roster-window.c:651
+msgid "Close"
+msgstr "àààààààà"
+
+#: ../src/empathy-roster-window.c:788
+#| msgid "Top up account credit"
+msgid "Top up account"
+msgstr "àààà ààààààà àààà"
+
+#: ../src/empathy-roster-window.c:1470
+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:1478
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "àààà àààààà àààààààààà àààààà ààààààààààààà %s"
+
+#: ../src/empathy-roster-window.c:1556
+#| msgid "You need to enable %s to see contacts here."
+msgid "Change your presence to see contacts here"
+msgstr "ààààààà àààààà ààààààà àà ààààààààà àààààà"
+
+#: ../src/empathy-roster-window.c:1565
+msgid "No match found"
+msgstr "àààààààààà àààààààà"
+
+#: ../src/empathy-roster-window.c:1570
+#| msgid "Show offline contacts"
+msgid "No online contacts"
+msgstr "àààâàààà àààààààà àààà"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_New Conversation..."
+msgstr "ààààà àààà... (_N)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#| msgid "New Call"
+msgid "New _Call..."
+msgstr "ààààà àààà... (_C)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#| msgid "Contact"
+msgid "Contacts"
+msgstr "àààààààà"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+#| msgid "_Add Contact"
+msgid "_Add Contacts..."
+msgstr "àààààààààà àààààà... (_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+#| msgid "_Search for Contactsâ"
+msgid "_Search for Contacts..."
+msgstr "ààààààà àààà àààààà... (_S)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "àààààààààààà àààààààà (_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#| msgid "_Room"
+msgid "_Rooms"
+msgstr "ààààà (_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join..."
+msgstr "àààà... (_J)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "ààààààààààà àààà (_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+#| msgid "Manage Favorites"
+msgid "_Manage Favorites"
+msgstr "ààààààààà àààààààààà (_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "àààà ààààààà (_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "àààààà (_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "àààààààààààà (_r)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+#| msgid "_Help"
+msgid "Help"
+msgstr "ààààà"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+#| msgid "Empathy"
+msgid "About Empathy"
+msgstr "ààààà ààààààà"
 
+#: ../src/empathy-roster-window-menubar.ui.h:17
 #: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "àààààààààààà (_Q)"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "àààààààààààâàààà"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "ààààà ààààààà "
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "àààààà (_i)"
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr "àààâààààâàà àààààà (_O)"
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "àààààà ààà"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "ààààà àààààà...(_N)"
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "àààààà àààààààà"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "ààààà àààà...(_C)"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "àààààà àààâàààà"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "àààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "àààààààààà ààààà àààà àààà"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:179
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "àààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "àààààà ààà"
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:210
+#| msgid "Enter your account details"
+msgid "Please enter your account details"
+msgstr "àààààà àà àààà àààààààà àààààààààààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "àààààààà àààààààààà ààààà àààààààà ààààà ààààààà"
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+#| msgid "Loading account information"
+msgid "Edit %s account options"
+msgstr "%s àààà ààààààààààà ààààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "àààààààà"
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+#| msgid "Enter your account details"
+msgid "Integrate your IM accounts"
+msgstr "àà IM ààààààà àààààààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "àààààààà ààààààààà àààà àààààà àààààààà"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "àààààààà ààààà VoIP ààààààà àààààààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "àààààà ààà àààà"
+#~ msgid "Show avatars"
+#~ msgstr "àààààààààà ààààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "àààààààà ààààààààà, àààààààà àààà"
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "àààà ààààààà ààààà ààààà ààààààààà àààààààà àààà àààààààààà ààààààààà ààààà."
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "ààààà àààà àààààà"
+#~ msgid "Show protocols"
+#~ msgstr "àààààààààààààà ààààààà"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "àààààààà"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "ààààà àààààààà àààààààà ààààà àààààààààààààà ààààààààà ààààà."
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "àààààà ààààà "
+#~ msgid "Compact contact list"
+#~ msgstr "ààààààààà ààààà àààààà"
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "àààààà ààààààààààà "
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "ààààà àààààààà ààààààààà ààààààà ààààààààà ààààà."
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr "ààààààà ààààààààààà àà ààààààà ààààààààà ààààààà. àààààà àààààà àà àààà àààààààà "
+#~ msgid "Contact list sort criterion"
+#~ msgstr "ààààà àààààà àààààààààààà ààààààà"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug 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\" ààààààà "
+#~ "ààààààààà àààààààààààààààà àààààààà. ààààà \"state\" àààààà ààààà àààààààà àààààààà ààààà "
+#~ "ààààààààààààààààààà."
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "àààààààà ààààààààà "
+#~ msgid "Network:"
+#~ msgstr "ààààâààààà:"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "àààààààààà"
+#~ msgid "Password:"
+#~ msgstr "àààààààà:"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "àààààà "
+#~ msgid "Port:"
+#~ msgstr "àààààà (_P):"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "ààààààààà"
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "â%sâ ààààà ààààààà ààààààà ààà"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "àààààààà"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %B %d %Y"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "ààààààà"
+#~ msgid "_Block User"
+#~ msgstr "ààààààààà ààààààààà (_B)"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "àààààààà"
+#~ msgid "Decide _Later"
+#~ msgstr "àààààà ààààààààààààà (_L)"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "àààààààààà"
+#~ msgid "Classic"
+#~ msgstr "ààààààààà"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "ààààà"
+#~ msgid "Simple"
+#~ msgstr "àààààà"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "àààà"
+#~ msgid "Clean"
+#~ msgstr "ààààààààààà"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "àààààà"
+#~ msgid "Blue"
+#~ msgstr "àààà"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "àààààà"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "àà ààààààààà ààààààààà àààààààààà ààààààààààà ààààà àààààààààà "
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "àààààà"
+#~ msgid "Contrast"
+#~ msgstr "ààààà"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "ààààààààà àààààààà àààààààààà àààààà ààààààààààààà ààààààààààà ààààààààààààà."
+#~ msgid "Brightness"
+#~ msgstr "àààààààà"
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
-msgid "Invite Participant"
-msgstr "ààààààààààà àààààààààà"
+#~ msgid "Gamma"
+#~ msgstr "àààà"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-msgid "Choose a contact to invite into the conversation:"
-msgstr "àààààààààà ààààààààààààà àà àààààààààà àààààààààà:"
+#~ msgid "Volume"
+#~ msgstr "ààààààààààà"
 
-#: ../src/empathy-invite-participant-dialog.c:224
-msgid "Invite"
-msgstr "àààààààààà"
+#~ msgid "_Sidebar"
+#~ msgstr "àààà ààààà(_S)"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "à ààààààààà ààààààààààààààà; ààààà ààààààà (ààà. àààààààààààà) ààààà àààààààààààà"
+#~ msgid "Audio input"
+#~ msgstr "ààààà àààâàààà"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "ààààà \"ààààààààà ààààààààà\" àààààà àààà àààà à ààààààààà ààààààààààà"
+#~ msgid "Video input"
+#~ msgstr "àààààà àààâàààà"
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "ààààààààààà àààààà àààààà àààààààà (ààà, gabble/jabber/foo_40example_2eorg0)"
+#~ msgid "Dialpad"
+#~ msgstr "ààààâàààààà"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<account-id>"
+#~ msgid "Details"
+#~ msgstr "ààààààà"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- ààààà àààààà"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "ààààààà"
 
-#: ../src/empathy-accounts.c:230
-msgid "Empathy Accounts"
-msgstr "ààààà àààààà"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "ààààààààààààààààà â %d:%02dm"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "àà ààààààààà ààà ààààààà"
+#~ msgid "Send Video"
+#~ msgstr "àààààààà àààà "
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- àààààààààà àààààààà"
+#~ msgid "Send Audio"
+#~ msgstr "ààààààà àààà"
 
-#: ../src/empathy-debugger.c:112
-msgid "Empathy Debugger"
-msgstr "ààààà ààà àààààààààààà"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "àààà ààà %s (%s)..."
 
-#: ../src/empathy-chat.c:106
-msgid "- Empathy Chat Client"
-msgstr "- ààààà àààà àààààààà"
+#~ msgid "Top Up..."
+#~ msgstr "àààà ààà..."
 
-#: ../src/empathy-notifications-approver.c:190
-msgid "Respond"
-msgstr "ààààààààà"
+#~ msgid "_Offline Contacts"
+#~ msgstr "àààâàààà àààààààà (_O)"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1493
-msgid "Reject"
-msgstr "ààààààààààà"
+#~ msgid "Show P_rotocols"
+#~ msgstr "àààààààààààààà ààààààà (_r)"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1494
-msgid "Answer"
-msgstr "àààààààààààà"
+#~ msgid "Credit Balance"
+#~ msgstr "àààààààà àààààààààà"
 
-#: ../src/empathy-notifications-approver.c:214
-msgid "Answer with video"
-msgstr "àààààà àà ààààààà"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "àààà àà àààààààà (_M)"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
-msgid "Decline"
-msgstr "àààààààààà"
+#~ msgid "Find in Contact _List"
+#~ msgstr "àààààààà àààààààà àààààà (_L)"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
-msgid "Accept"
-msgstr "àààààààààà"
+#~ msgid "Sort by _Name"
+#~ msgstr "àààààà ààààà ààààààààààààààà (_N)"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
-msgid "Provide"
-msgstr "àààààààà"
+#~ msgid "Sort by _Status"
+#~ msgstr "àààààààà ààààà ààààààààààààààà (_S)"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s ààààààà àààà ààààààààà ààààààààààààà, àààà àààà àààà àààà àààà ààààààà."
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "àààààààààà àààààà àààààààà (_A)"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1124 ../src/empathy-call-window.c:1140
-msgid "i"
-msgstr " àààà"
+#~ msgid "N_ormal Size"
+#~ msgstr "àààààà àààààààà (_o)"
 
-#: ../src/empathy-call-window.c:2860
-msgid "On hold"
-msgstr "àà ààà"
+#~ msgid "_Compact Size"
+#~ msgstr "àààààààààà ààààààà (_C)"
 
-#: ../src/empathy-call-window.c:2863
-msgid "Mute"
-msgstr "ààààààà"
+#~ msgid "_Joinâ"
+#~ msgstr "àààà...(_J)"
 
-#: ../src/empathy-call-window.c:2865
-msgid "Duration"
-msgstr "àààààà"
+#~ msgid "Could not start room listing"
+#~ msgstr "ààà ààààààààààà àààààààààààààààààààà"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2868
-#, c-format
-msgid "%s â %d:%02dm"
-msgstr "%s â %d:%02dm"
+#~ msgid "Could not stop room listing"
+#~ msgstr "ààà ààààààààààà àààààààààààà"
 
-#: ../src/empathy-call-window.c:3138
-#, c-format
-msgid "Your current balance is %s."
-msgstr "àà ààààà ààààààà %s"
+#~ msgid "Appearance"
+#~ msgstr "ààààààààààààà"
 
-#: ../src/empathy-call-window.c:3142
-msgid "Sorry, you donât have enough credit for that call."
-msgstr "àààà àààààààààààà àààààààààà ààààààà àààà "
+#~ msgid "Redial"
+#~ msgstr "àààààààààààâàààà"
 
-#: ../src/empathy-call-window.c:3144
-msgid "Top Up"
-msgstr "àààà ààà..."
+#~ msgid "V_ideo"
+#~ msgstr "àààààà (_i)"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "ààààààà ààààààà (_M)"
+#~ msgid "Video Off"
+#~ msgstr "àààààà ààà"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "àààà à àààà àààà àààààà ààààààààààààà?"
+#~ msgid "Video Preview"
+#~ msgstr "àààààà àààààààà"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-msgid "Adding new account"
-msgstr "ààààà àààà"
+#~ msgid "Video On"
+#~ msgstr "àààààà àààâàààà"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "ààààààààà àààààà"
+#~ msgid "Call the contact again"
+#~ 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 ""
-"àààààààààà àààààààààààà àààààààààà ààààà àààà ààà ààààààààà ààà ààààààà àààààà àààà àààààààààà. àà "
-"àààààààààààààà àààà ààààààààà, àààààà àààààààà àààààààà ààààà àààààààà. àààà ààààààà 'àààààààà' ààààààà "
-"ààààààààà à ààààà àààààà à ààààààà àààààà àààà àààààà ààààààààààà"
+#~ msgid "Camera Off"
+#~ 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 â àààààà</span> àààààààà àààààààà"
+#~ 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 "Contact Map View"
+#~ msgstr "ààààà àààà àààààà"
 
 #~ msgid "_Disable"
 #~ msgstr "àààààààààà (_D)"
 
-#~| msgid "%s:"
-#~ msgid "%s"
-#~ msgstr "%s:"
-
 #~ msgid "Call volume"
 #~ msgstr "àààà àààààààààà"
 
@@ -4808,9 +4894,6 @@ 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 "àààà à ààààà àààà àààààà ààààààààààààààààààààààà?"
 
@@ -5057,9 +5140,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>"
 
@@ -5118,12 +5198,6 @@ msgstr ""
 #~ msgid "Unknown error"
 #~ msgstr "ààààààà ààààà"
 
-#~ msgid "_Join..."
-#~ msgstr "àààà... (_J)"
-
-#~ msgid "_New Conversation..."
-#~ msgstr "ààààà àààà... (_N)"
-
 #~ msgid "Allow _GPS usage"
 #~ msgstr "_GPS ààààààààààà ààààààààààà"
 



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