[empathy] Updated Gujarati Translations



commit 256f5d0ce289f91ad29923ba053bceacbcb8f2a2
Author: Sweta Kothari <swkothar redhat com>
Date:   Thu Jul 26 14:32:12 2012 +0530

    Updated Gujarati Translations

 po/gu.po | 3620 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 1787 insertions(+), 1833 deletions(-)
---
diff --git a/po/gu.po b/po/gu.po
index 46ef600..304070a 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -8,10 +8,11 @@ msgstr ""
 "Project-Id-Version: gu\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
 "cgi?product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-03-16 10:47+0000\n"
-"PO-Revision-Date: 2012-03-22 13:11+0530\n"
+"POT-Creation-Date: 2012-07-24 18:19+0000\n"
+"PO-Revision-Date: 2012-07-26 13:46+0530\n"
 "Last-Translator: \n"
 "Language-Team: gu_IN <kde-i18n-doc kde org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,7 +37,7 @@ msgstr "Google Talk, Facebook, MSN ààà ààà àààà àààà
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2512
+#: ../src/empathy-accounts-dialog.c:2523
 msgid "Messaging and VoIP Accounts"
 msgstr "àààààààà ààà VoIP ààààà"
 
@@ -44,11 +45,11 @@ msgstr "àààààààà ààà VoIP ààààà"
 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
 #, fuzzy
 #| msgid ""
 #| "Whether or not connectivity managers should be used to automatically "
@@ -59,11 +60,11 @@ msgid ""
 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
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy should automatically log in to your accounts on "
@@ -71,13 +72,13 @@ msgstr "ààààààà ààààààà ààààà àààà
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "ààààààà àààààààààààààà àà Empathy àà ààààà ààààà àààààààà àààààà àààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 #, fuzzy
 #| msgid "Empathy should auto-connect on startup"
 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
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy should automatically log in to your accounts on "
@@ -85,66 +86,43 @@ msgstr "ààààààà ààààààà ààààà àààà
 msgid "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "ààààààà àààààààààààààà àà Empathy àà ààààà ààààà àààààààà àààààà àààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
 msgstr "Empathy àààààà ààààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "ààà àààà àààààà ààà àààààà àààà àààà àààààà àààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
 msgid "Magic number used to check if sanity cleaning tasks should be run"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
 msgid ""
 "empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
 "should be executed or not. Users should not change this key manually."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "àààààà ààààààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show contacts that are offline in the contact list."
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "ààààààà àààààà ààààààà ààààààà àà àààààà àà àà ààààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Show avatars"
-msgstr "àààààààà ààààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-#, fuzzy
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
-msgid "Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "ààààààà àààààà àààà ààà àààààà ààààààààà ààààààà àààà àààààààà ààààààà àà àààà."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Show protocols"
-msgstr "àààààààààààà ààààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-#, fuzzy
-#| msgid ""
-#| "Whether or not to show avatars for contacts in the contact list and chat "
-#| "windows."
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "ààààààà àààààà àààà ààà àààààà ààààààààà ààààààà àààà àààààààà ààààààà àà àààà."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 #| msgid "Show offline contacts"
 msgid "Show Balance in contact list"
-msgstr "àààààà ààààààààà ààààà"
+msgstr "àààààà ààààààà àààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show avatars for contacts in the contact list and chat "
@@ -152,45 +130,35 @@ msgstr "àààààà ààààààààà ààààà"
 msgid "Whether to show account balances in the contact list."
 msgstr "ààààààà àààààà àààà ààà àààààà ààààààààà ààààààà àààà àààààààà ààààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Compact contact list"
-msgstr "àààààà àààààà àààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-#, fuzzy
-#| msgid "Whether to show the contact list in compact mode or not."
-msgid "Whether to show the contact list in compact mode."
-msgstr "ààààààà ààààààà ààààààààà àààààààà ààààààà àà àààà."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "ààààà àààààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "ààààà àààààààà àààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "ààààà ààààààà àààà àààà àààà àààààà ààààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
 msgstr "àààààà ààààààààà àà àà ààààà ààààà àààà àààà ààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "ààà ààààààààà ààà ààààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 msgid "Always open a separate chat window for new chats."
 msgstr "àààààà ààà àààààà àààà ààà àààààà àààààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "ààààààààà àààààààààà ààààààà ààààààà ààààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 msgid ""
 "Display incoming events in the status area. If false, present them to the "
 "user immediately."
@@ -198,21 +166,20 @@ msgstr ""
 "ààààààààà àààààààààà àààà ààààààà ààààààà. àà àààà ààà àà, ààà à àààààààààà àààà ààààà "
 "àààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "ààààà àààààà àààà ààààà àààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "ààààà àààààà àààà àààààààà àààààààà ààààà (àààààààààà)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 #| msgid "Show contact list in rooms"
 msgid "Show contact groups"
-msgstr "ààààààà àààààà àààààà ààààà"
+msgstr "àààààà àààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show avatars for contacts in the contact list and chat "
@@ -220,82 +187,61 @@ msgstr "ààààààà àààààà àààààà àààà
 msgid "Whether to show groups in the contact list."
 msgstr "ààààààà àààààà àààà ààà àààààà ààààààààà ààààààà àààà àààààààà ààààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-#, fuzzy
-#| msgid "Contact list sort criterium"
-msgid "Contact list sort criterion"
-msgstr "àààààà àààà ààààà àààà"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-#, fuzzy
-#| msgid ""
-#| "Which criterium to use when sorting the contact list. Default is to use "
-#| "sort by the contact's name with the value \"name\". A value of \"state\" "
-#| "will sort the contact list by state."
-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:35
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "ààààà ààààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for events."
 msgid "Whether to play a sound to notify of events."
 msgstr "ààààààà ààààà àààà ààààà àààà àààà àààààà àà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "àààààà ààà ààà àààààà àààààà àà ààààààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 #, fuzzy
 #| msgid "Whether or not to play sound notifications when away or busy."
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ààààààà àààààà ààà ààà àààà àààààà ààà àààààà àààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "ààààààà ààààààà àààà àààààà àà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for incoming messages."
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "ààààààà àààààà ààààààà ààààààà àààà ààààà àààà àààà àààààà àà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "ààààààà ààààààà àààà àààààà àà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for outgoing messages."
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "ààààààà ààààààà ààààààà àààà ààààà àààà àààà àààààà àà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "ààà ààààààààà àààà àààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 #, fuzzy
 #| msgid "Whether or not to play a sound to notify for new conversations."
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "ààààààà àààà ààààààààà àààà ààààà àààà àààà àààààà àà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "àààààà ààààààà àààààààà ààà àààààà àààààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 #, fuzzy
 #| msgid ""
 #| "Whether or not to play a sound to notify for contacts logging in the "
@@ -303,11 +249,11 @@ msgstr "àààààà ààààààà àààààààà àà
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "ààààààà ààààààà à àààààààààà àààààààà àààà ààààà àààà àààààà àà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../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:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 #, fuzzy
 #| msgid ""
 #| "Whether or not to play a sound to notify for contacts logging off the "
@@ -315,54 +261,54 @@ msgstr "àààà àà ààààà àààààà ààààà
 msgid "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "ààààààà ààààààà àà ààààààà àà ààà àààà àààà ààààà àààà àààà àààààà àà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../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:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 #, fuzzy
 #| msgid "Whether or not to play a sound when logging in a network."
 msgid "Whether to play a sound when logging into a network."
 msgstr "ààààààà àààààà ààààààà ààà ààààààà ààààà ààà àààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "àààààà àààà àààà àààààà ààà àààààà àààààà àà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 #, fuzzy
 #| msgid "Whether or not to play a sound when logging off a network."
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ààààààà àààààà ààààààà ààà ààà àààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "ààà ààààààà àààà ààààà àààààà àà àààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show a popup notification when receiving a new message."
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ààààààà àààààà ààà ààààààà ààààà ààààà ààà àààààà ààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "àààààà ààà ààà àààààà ààààà àààààà àà ààààààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 #, fuzzy
 #| msgid "Whether or not to show popup notifications when away or busy."
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ààààààà àààààà ààà ààà àààà àààààà ààà àààààà ààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 #, fuzzy
 #| msgid "Popup notifications if the chat isn't focused"
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "ààààà àààààà àà àààààà àààààààà àààà à ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show a popup notification when receiving a new message "
@@ -374,129 +320,131 @@ msgstr ""
 "ààààààà àààààà ààà àààààààà ààààà ààààà ààà àààààà ààààà àààààà àà àààààà àà àààà àà àààààà "
 "à ààààààà à ààààà ààà, ààààà àààààààà àààà ààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 #, fuzzy
 #| msgid "Popup notifications when a contact sign in"
 msgid "Pop up notifications when a contact logs in"
 msgstr "ààààà àààààà àààààà àààààà ààààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show a popup notification when a contact goes online."
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ààààààà àààààà àààààà àààààà ààà àààààà ààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 #, fuzzy
 #| msgid "Popup notifications when a contact sign out"
 msgid "Pop up notifications when a contact logs out"
 msgstr "ààààà àààààà àààààà àààààà àààà ààààà àààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show a popup notification when a contact goes offline."
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ààààààà àààààà àààààà àààààà ààà àààààà ààààà àààààààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "àààààààà ààààààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 #, fuzzy
 #| msgid ""
 #| "Whether or not to convert smileys into graphical images in conversations."
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "ààààààà àààààààààààà ààààààààà àààààààà ààààààààà ààààààà ààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "ààààààà àààààà àààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 #, fuzzy
 #| msgid "Whether or not to show the contact list in chat rooms."
 msgid "Whether to show the contact list in chat rooms."
 msgstr "ààààààà àààààà ààààààà àààààà àààààà àààààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "àààààà àààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ààà àà àà àààààà ààààààààà ààààààààààà ààààààà àààà àààààà àà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 #, fuzzy
 #| msgid "Chat window theme"
 msgid "Chat window theme variant"
 msgstr "àààààà àààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 #, fuzzy
 #| msgid "The theme that is used to display the conversation in chat windows."
 msgid "The theme variant that is used to display the conversation in chat windows."
 msgstr "ààà àà àà àààààà ààààààààà ààààààààààà ààààààà àààà àààààà àà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 #, fuzzy
 #| msgid "Path of the adium theme to use"
 msgid "Path of the Adium theme to use"
 msgstr "àààààà àààà ààààà ààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:65
 #, fuzzy
 #| msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+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:73
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "WebKit Developer Tools àà àààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "ààààààà WebKit developer tools àààà àà Web Inspector àààààà àààà àààà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "àààà ààààààààààààà ààààà àààààà ààà àààààà ààà ààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "àààààà àààà àààà ààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 #, fuzzy
 #| msgid "Whether to use the theme for chat rooms or not."
 msgid "Whether to use the theme for chat rooms."
 msgstr "àààààà àààà àààà ààà àààààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "ààààààà ààààà ààààà ààààà àà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 #, fuzzy
 #| msgid ""
 #| "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
 msgid "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "ààààà ààààààà ààààààà àààààà àààà àà àààà ààà ààààà àààà (àà.à. en, fr, nl)."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "ààààà ààààààààà àààààà ààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 #, fuzzy
 #| msgid ""
 #| "Whether or not to check words typed against the languages you want to "
@@ -504,11 +452,11 @@ msgstr "ààààà ààààààààà àààààà ààà
 msgid "Whether to check words typed against the languages you want to check with."
 msgstr "ààààààà ààààà àà ààààààà àààà àààà ààààà ààà àààààà ààààà àà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "ààààà àààààà àààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -516,11 +464,11 @@ msgstr ""
 "àààààà ààà àààààà ààà ààààà àà ààààà ààààààà (ààà) ààà ààààà ààà àààààà ààààà ààà "
 "ààààààà ààààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "ààààààà à àààààà àààààà ààààà àààààààà ààààà àààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy should use the avatar of the contact as the chat "
@@ -528,47 +476,45 @@ msgstr "ààààààà à àààààà àààààà àà
 msgid "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "ààààààà àààààà àààààà ààààà ààààà àààààààà ààààà àààààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../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:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 #| msgid "Camera On"
 msgid "Camera device"
-msgstr "àààààà àààà"
+msgstr "àààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "àààààà àààààà àààààà àààà àààààà àààààà ààààà, àà.à. /dev/video0."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 #| msgid "Camera On"
 msgid "Camera position"
-msgstr "àààààà àààà"
+msgstr "àààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr ""
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "ààààà àààààà ààà àààà ààààààà ààààà ààààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 #, fuzzy
 #| msgid ""
 #| "Whether or not to show the message dialog about closing the main window "
@@ -580,53 +526,53 @@ msgstr ""
 "ààààààà àààààà àààààààà 'x' ààà àààà ààààà àààààààà ààà àààà ààààààà ààààà ààààààà ààààààà àà "
 "àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
 msgstr "Empathy à ààààààààààààà ààààààà àààààààà ààà ààà àà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy can publish the user's location to his contacts."
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "ààààààà ààààà àààààààààà ààààààààààààà ààààààà Empathy à àààààààà ààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy can use the network to guess the location"
 msgstr "ààààààà ààààà àààà Empathy à ààààààà ààààà ààà àà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 #, fuzzy
 #| msgid "Whether or not Empathy can use the network to guess the location."
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "ààààààà ààààààà ààààà àààà Empathy à ààààààà ààààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+#: ../data/org.gnome.Empathy.gschema.xml.h:94
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy ààààààà ààààà àààà àààààààà ààààààààà ààààà ààà àà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+#: ../data/org.gnome.Empathy.gschema.xml.h:95
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy can use the cellular network to guess the location."
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "ààààààà ààààààà ààààà àààà Empathy à àààààààà ààààààà àà ààààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:96
 msgid "Empathy can use the GPS to guess the location"
 msgstr "ààààààà ààààà àààà Empathy à GPS àà ààààà ààà àà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:97
 #, fuzzy
 #| msgid "Whether or not Empathy can use the GPS to guess the location."
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "ààààààà ààààààà ààààà àààà Empathy à GPS àà ààààà àààà àà àààà."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+#: ../data/org.gnome.Empathy.gschema.xml.h:98
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy à ààààààà àààààààààà àààààà àààà"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+#: ../data/org.gnome.Empathy.gschema.xml.h:99
 #, fuzzy
 #| msgid ""
 #| "Whether or not Empathy should reduce the location's accuracy for privacy "
@@ -634,371 +580,298 @@ msgstr "Empathy à ààààààà àààààààààà àà
 msgid "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "ààààààà ààààà ààààà àààà ààààààà àààààààààà Empathy à àààààà àààà àà àààà."
 
-#: ../libempathy/empathy-ft-handler.c:738
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "No reason was specified"
 msgstr "àààà àààààà àààà ààà"
 
-#: ../libempathy/empathy-ft-handler.c:741
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "The change in state was requested"
 msgstr "ààààààààà ààààà à ààààà àààà ààà"
 
-#: ../libempathy/empathy-ft-handler.c:744
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "You canceled the file transfer"
 msgstr "ààà àààààà àààààà ààààààà àà àààà àà"
 
-#: ../libempathy/empathy-ft-handler.c:747
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "The other participant canceled the file transfer"
 msgstr "àààà àààààà à àààà àààààà ààààààà àà àààà àà"
 
-#: ../libempathy/empathy-ft-handler.c:750
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "Error while trying to transfer the file"
 msgstr "ààà àààààà àààà àà àààààà àààààà ààààààà ààà ààààà ààà àààààà"
 
-#: ../libempathy/empathy-ft-handler.c:753
+#: ../libempathy/empathy-ft-handler.c:752
 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:755 ../libempathy/empathy-utils.c:312
 msgid "Unknown reason"
 msgstr "àààààà àààà"
 
-#: ../libempathy/empathy-ft-handler.c:919
+#: ../libempathy/empathy-ft-handler.c:918
 msgid "File transfer completed, but the file was corrupted"
 msgstr "àààà àààààà àààààà àààà àà, ààààà àààà ààààà ààà"
 
-#: ../libempathy/empathy-ft-handler.c:1205
+#: ../libempathy/empathy-ft-handler.c:1204
 msgid "File transfer not supported by remote contact"
 msgstr "àààà àààààà àààààà àààààà àààààà ààààààà ààà"
 
-#: ../libempathy/empathy-ft-handler.c:1261
+#: ../libempathy/empathy-ft-handler.c:1260
 msgid "The selected file is not a regular file"
 msgstr "àààà àààà àààà àààààà àààà ààà"
 
-#: ../libempathy/empathy-ft-handler.c:1270
+#: ../libempathy/empathy-ft-handler.c:1269
 msgid "The selected file is empty"
 msgstr "àààà àààà àààà àààà àà"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Password required"
+msgid "Password not found"
+msgstr "ààààààà ààààà ààà"
+
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "%s (%s) àààà IM àààà ààààààà"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "àààà %s (%s) àà ààààààààà ààà '%s' àààà ààààààà"
+
+#: ../libempathy/empathy-message.c:407 ../src/empathy-call-observer.c:116
 #, fuzzy, c-format
 #| msgid "Incoming call from %s"
 msgid "Missed call from %s"
 msgstr "%s ààààà ààààààà ààà"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:411
 #, fuzzy, c-format
 #| msgid "Call with %s"
 msgid "Called %s"
 msgstr "%s àààà ààà ààà"
 
-#: ../libempathy/empathy-message.c:422
-#, fuzzy, c-format
+#: ../libempathy/empathy-message.c:414
+#, c-format
 #| msgid "Incoming call from %s"
 msgid "Call from %s"
-msgstr "%s ààààà ààààààà ààà"
+msgstr "%s ààààà ààà ààà"
+
+#: ../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:233
+#: ../libempathy/empathy-utils.c:232
 msgid "Available"
 msgstr "àààààà"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:234
 msgid "Busy"
 msgstr "àààààà"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:237
 msgid "Away"
 msgstr "ààà ààà"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:239
 msgid "Invisible"
 msgstr "àààààà"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:241
 msgid "Offline"
 msgstr "àààààà"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
-#, fuzzy
+#: ../libempathy/empathy-utils.c:244
 #| msgid "Unknown"
 msgctxt "presence"
 msgid "Unknown"
 msgstr "àààààà"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:284
 msgid "No reason specified"
 msgstr "àààà àààààà àààà ààà"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
 msgid "Status is set to offline"
 msgstr "àààààààà àààààà ààààà ààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
 #: ../libempathy-gtk/empathy-call-utils.c:47
-#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+#: ../libempathy-gtk/empathy-new-message-dialog.c:80
 msgid "Network error"
 msgstr "ààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
 msgid "Authentication failed"
 msgstr "àààààààààà ààà àààààààà"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
 msgid "Encryption error"
 msgstr "ààààààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:294
 msgid "Name in use"
 msgstr "ààà àààààààà àà"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
 msgid "Certificate not provided"
 msgstr "àààààààààà àààà ààààà àààà"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
 msgid "Certificate untrusted"
 msgstr "àààààààààà àààààààààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
 msgid "Certificate expired"
 msgstr "àààààààààà ààààààà àààà àà"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
 msgid "Certificate not activated"
 msgstr "àààààààààà àààààà àààà ààà"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
 msgid "Certificate hostname mismatch"
 msgstr "àààààààààà àààààààà àààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
 msgid "Certificate fingerprint mismatch"
 msgstr "àààààààààà àààààààààà àààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
 msgid "Certificate self-signed"
 msgstr "àààààààààà ààààà-ààà àààà"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:310
 msgid "Certificate error"
 msgstr "àààààààààà ààà"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:344
 msgid "Encryption is not available"
 msgstr "àààààààààà àààààà ààà"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:346
 msgid "Certificate is invalid"
 msgstr "àààààààààà àààààà àà"
 
-#: ../libempathy/empathy-utils.c:349
-#, fuzzy
+#: ../libempathy/empathy-utils.c:348
 #| msgid "Connection managers should be used"
 msgid "Connection has been refused"
-msgstr "ààààà ààààààààààà àààààà àààà àààà"
+msgstr "ààààà ààààààà ààààààà ààààà àà"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:350
 msgid "Connection can't be established"
 msgstr "ààààààà ààààààà ààà ààààà ààà"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:352
 msgid "Connection has been lost"
 msgstr "ààààà ààà àà àààà"
 
-#: ../libempathy/empathy-utils.c:355
-#, fuzzy
+#: ../libempathy/empathy-utils.c:354
 #| msgid "This resource is already connected to the server"
 msgid "This account is already connected to the server"
-msgstr "à ààààààà ààààààà à ààààà àààà ààààààà àà"
+msgstr "à àààà ààààààà à àààààààà ààààààà àà"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:356
 msgid "Connection has been replaced by a new connection using the same resource"
 msgstr "àààà ààààààààà ààààà ààà ààààà àààààà ààààààà àààà ààààààà ààààà àà"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:359
 msgid "The account already exists on the server"
 msgstr "àààà ààààààà à ààààà àà àààààààà ààààà àà"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:361
 msgid "Server is currently too busy to handle the connection"
 msgstr "ààààà ààààà ààààààà àààààààààà àààààà àà"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:363
 #, fuzzy
 #| msgid "Certificate not provided"
 msgid "Certificate has been revoked"
 msgstr "àààààààààà àààà ààààà àààà"
 
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:365
 msgid "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:368
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
 msgstr ""
 
-#: ../libempathy/empathy-utils.c:373
+#: ../libempathy/empathy-utils.c:372
 msgid "Your software is too old"
 msgstr "àààààà àààààààà ààà àààà àà"
 
-#: ../libempathy/empathy-utils.c:375
-#, fuzzy
+#: ../libempathy/empathy-utils.c:374
 #| msgid "Interval (seconds)"
 msgid "Internal error"
-msgstr "àààààà (àààààà)"
+msgstr "àààààà ààà"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:503
 msgid "People Nearby"
 msgstr "àààà àààà"
 
-#: ../libempathy/empathy-utils.c:539
+#: ../libempathy/empathy-utils.c:508
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ààààà"
 
-#: ../libempathy/empathy-utils.c:568
+#: ../libempathy/empathy-utils.c:537
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../libempathy/empathy-utils.c:569
+#: ../libempathy/empathy-utils.c:538
 msgid "Facebook Chat"
 msgstr "Facebook àààààà"
 
-#: ../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
-#, fuzzy
-#| msgid "Password required"
-msgid "Password not found"
-msgstr "ààààààà ààààà"
-
-#: ../libempathy/empathy-keyring.c:218
-#, c-format
-msgid "IM account password for %s (%s)"
-msgstr "%s (%s) àààà IM àààà ààààààà"
-
-#: ../libempathy/empathy-keyring.c:253
-#, c-format
-msgid "Password for chatroom '%s' on account %s (%s)"
-msgstr "àààà %s (%s) àà ààààààààà ààà '%s' àààà ààààààà"
-
 #: ../libempathy-gtk/empathy-account-chooser.c:692
-#, fuzzy
 #| msgid "_Accounts"
 msgid "All accounts"
-msgstr "ààààà (_A)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:336
-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:14
-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 "ààààààà (_o)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1812
-msgid "This account already exists on the server"
-msgstr "à àààà ààààààà à ààààà àà àààààààà ààààà àà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1816
-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:2241
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s àà %1$s"
-
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2267
-#, c-format
-msgid "%s Account"
-msgstr "%s àààà"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2271
-msgid "New account"
-msgstr "ààà àààà"
+msgstr "ààà àààà"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
@@ -1006,13 +879,14 @@ msgstr "ààà àààà"
 #: ../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"
@@ -1033,30 +907,30 @@ 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:15
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
 msgid "Advanced"
 msgstr "ààààà àààà"
@@ -1074,41 +948,118 @@ msgstr "ààààà AIM ààààààà àà àà?"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
 msgid "Remember Password"
 msgstr "ààààààà ààà àààà"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-msgid "Login I_D:"
-msgstr "àààààà ID (_D):"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "<b>Example:</b> username"
-msgstr "<b>àààààà:</b> ààààààààààààà"
+#: ../libempathy-gtk/empathy-account-widget.c:678
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:323
+msgid "Account"
+msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-msgid "What is your GroupWise User ID?"
-msgstr "ààààà ààà ààààààà àààààààààà ID ààà àà?"
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Password"
+msgstr "ààààààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:680
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "ààààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "ààààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#, c-format
+#| msgid "%s:"
+msgid "%s"
+msgstr "%s"
+
+#: ../libempathy-gtk/empathy-account-widget.c:820
+#, c-format
+msgid "%s:"
+msgstr "%s:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1432
+msgid "Username:"
+msgstr "ààààààààààààà:"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1749
+msgid "A_pply"
+msgstr "àààà ààà (_p)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1778
+msgid "L_og in"
+msgstr "ààààààà (_o)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1848
+msgid "This account already exists on the server"
+msgstr "à àààà ààààààà à ààààà àà àààààààà ààààà àà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1852
+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:2269
+#, 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:2295
+#, c-format
+msgid "%s Account"
+msgstr "%s àààà"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2299
+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 "àààààà ID (_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 "ààààà ààà ààààààà àààààààààà ID ààà àà?"
 
 #: ../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 "ICQUIN (_U):"
+#| msgid "ICQ _UIN:"
+msgid "ICQ _UIN"
+msgstr "ICQUIN (_U)"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>àààààà:</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h: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?"
@@ -1118,109 +1069,76 @@ msgstr "ààààà ICQ UIN ààà àà?"
 msgid "What is your ICQ password?"
 msgstr "ààààà ICQ ààààààà ààà àà?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
-msgid "Auto"
-msgstr "ààààà"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:215
-msgid "TLS"
-msgstr "TLS"
-
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:244
-msgid "Register"
-msgstr "ààààààà"
-
-#. translators: this string is very specific to SIP's internal; maybe
-#. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:249
-msgid "Options"
-msgstr "ààààààà"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:252
-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
-#, fuzzy
 #| msgid "_Addâ"
 msgid "Addâ"
-msgstr "ààààà (_A)..."
+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
 #: ../src/empathy-chatrooms-window.ui.h:3
-#, fuzzy
 #| msgid "_Remove"
 msgid "Remove"
-msgstr "ààà ààà (_R)"
+msgstr "ààà ààà"
 
+#. Translators: tooltip on a 'Go Up' button used to sort IRC servers by priority
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Up"
 msgstr "ààà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-#, fuzzy
+#. Translators: tooltip on a 'Go Down' button used to sort IRC servers by priority
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 #| msgid "Domain"
 msgid "Down"
-msgstr "àààààà"
+msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Servers"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
 msgstr ""
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Nickname:"
-msgstr "ààààà:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
-msgid "Password:"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Quit message:"
-msgstr "àààààà àààà àà:"
+#| msgid "Nickname:"
+msgid "Nickname"
+msgstr "ààààà"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "Real name:"
-msgstr "àààà ààà:"
+#| msgid "Quit message:"
+msgid "Quit message"
+msgstr "àààààà àààà àà"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+#| msgid "Real name:"
+msgid "Real name"
+msgstr "àààà ààà"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+#| msgid "Username:"
+msgid "Username"
+msgstr "ààààààààààààà"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
 msgid "Which IRC network?"
 msgstr "àààà IRC ààààààà àà?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:18
 msgid "What is your IRC nickname?"
 msgstr "ààààà IRC ààààà ààà àà?"
 
@@ -1262,25 +1180,27 @@ msgid "I_gnore SSL certificate errors"
 msgstr "SSL àààààààààà àààà ààààà (_g)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
-msgstr "ààààààààà (_t):"
+#| 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 "ààààààààààà ààààà à (TLS/SSL) (_y)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "Use old SS_L"
-msgstr "ààààà SSL ààààà (_L)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "Override server settings"
 msgstr "ààààà àààààààà àà ààààà ààà"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Use old SS_L"
+msgstr "ààààà SSL ààààà (_L)"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ààààà Jabber ID ààà àà?"
@@ -1297,6 +1217,36 @@ msgstr "ààààà Jabber ààààààà ààà àà?"
 msgid "What is your desired Jabber password?"
 msgstr "ààààà àààààà Jabber ààààààà ààà àà?"
 
+#: ../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 "àààà ID (_J)"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
+#| msgid "E-_mail address:"
+msgid "E-_mail address"
+msgstr "àààà ààààààà (_m)"
+
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>àààààà:</b> user hotmail com"
@@ -1309,33 +1259,39 @@ msgstr "ààààà Windows Live IDààà ààà àà?"
 msgid "What is your Windows Live password?"
 msgstr "ààààà Windows Live ààààààà ààà àà?"
 
-#: ../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 "àààà ID (_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 "àààà ààààààà (_m):"
+#: ../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"
@@ -1358,8 +1314,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"
@@ -1371,31 +1328,28 @@ msgstr "àààààà STUN ààààààà àààà"
 msgid "Discover Binding"
 msgstr "STUN àààà"
 
-#: ../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
 #, fuzzy
 #| msgid "STUN port:"
-msgid "Transport:"
+msgid "Transport"
 msgstr "STUN ààààà:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
@@ -1406,18 +1360,23 @@ msgstr "ààààà ààààààà"
 msgid "Ignore TLS Errors"
 msgstr "TLS àààà ààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Port:"
-msgstr "ààààà:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#| msgid "E-mail address:"
+msgid "Local IP Address"
+msgstr "ààààààà IP ààààààà"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ààààà SIP àààààà ID ààà àà?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid "What is your SIP account password?"
 msgstr "ààààà 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 "Yahoo! ID (_D):"
@@ -1430,6 +1389,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 "ààààà Yahoo! ID ààà àà?"
@@ -1448,10 +1415,9 @@ msgid "None of the accepted image formats are supported on your system"
 msgstr "ààà àà ààààààààà ààààààà à ààààà àààààà àà ààààààà ààà"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:819
-#, fuzzy
 #| msgid "Couldn't convert image"
 msgid "Couldn't save picture to file"
-msgstr "àààà àà ààààààààà ààà ààààà ààà"
+msgstr "ààààààà ààààààà ààààààà ààààà àààà"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
@@ -1477,28 +1443,58 @@ msgstr "ààà ààààà"
 msgid "Click to enlarge"
 msgstr "ààààààà àààà àààà ààààà ààà"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+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:3725
+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 ""
+"àààà àààà ààààà ààààààààà àààà ààà\n"
+"<b>%s</b>"
+
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+#| msgctxt "verb in a column header displaying group names"
+#| msgid "Select"
+msgid "Select..."
+msgstr "àààà ààà..."
+
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+#| msgctxt "verb in a column header displaying group names"
+#| msgid "Select"
+msgid "_Select"
+msgstr "àààà ààà (_S)"
+
 #: ../libempathy-gtk/empathy-call-utils.c:42
 #: ../libempathy-gtk/empathy-call-utils.c:60
-#, fuzzy
 #| msgid "There was an error while creating the account."
 msgid "There was an error starting the call"
-msgstr "àààààà àààààà ààààà ààààà ààà àààààà ààààà ààà ààà."
+msgstr "ààààà ààà àààà àààà ààà ààà"
 
 #: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "àààààà àààà àààààà ààààà àààà àààà ààà"
 
 #: ../libempathy-gtk/empathy-call-utils.c:51
-#, fuzzy
 #| msgid "The selected contact is offline."
 msgid "The specified contact is offline"
-msgstr "àààà àààà àààààà àààààà àà."
+msgstr "àààààà àààà àààààà àààààà àà"
 
 #: ../libempathy-gtk/empathy-call-utils.c:53
-#, fuzzy
 #| msgid "The selected contact is offline."
 msgid "The specified contact is not valid"
-msgstr "àààà àààà àààààà àààààà àà."
+msgstr "àààààà àààà àààààà ààààà ààà"
 
 #: ../libempathy-gtk/empathy-call-utils.c:55
 #, fuzzy
@@ -1510,74 +1506,73 @@ msgstr "à àààààà àà àààà ààààààà àà
 msgid "You don't have enough credit in order to place this call"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:729
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "ààààà ààààààààààà àààààààà àààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:787
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "à àààààà àà àààà ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:793
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "àààà àààààà ààààà àààà ààààààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:992
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:968
 #| msgid "invalid contact"
-msgid "â%sâ is not a valid contact ID"
-msgstr "àààààà àààààà"
+msgid "Invalid contact ID"
+msgstr "àààààà àààààà ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1087
+#: ../libempathy-gtk/empathy-chat.c:1055
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: àààààà ààààààààà ààààà ààà ààààààààà ààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1090
+#: ../libempathy-gtk/empathy-chat.c:1058
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <topic>: àààààà àààààààààààà àààààà ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1093
+#: ../libempathy-gtk/empathy-chat.c:1061
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <chat room ID>: ààà ààààààààà ààà àààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1096
+#: ../libempathy-gtk/empathy-chat.c:1064
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <chat room ID>: ààà ààààààààà ààà àààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1104
+#: ../libempathy-gtk/empathy-chat.c:1072
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <contact ID> [<message>]: ààààà ààààààààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1107
+#: ../libempathy-gtk/empathy-chat.c:1075
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <contact ID> <message>: ààààà ààààààààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1110
+#: ../libempathy-gtk/empathy-chat.c:1078
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nickname>: àààààà ààààà àà ààààà ààààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1113
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <message>: àààààà àààààààààààà ACTION àààààààà ààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1116
+#: ../libempathy-gtk/empathy-chat.c:1084
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
 
-#: ../libempathy-gtk/empathy-chat.c:1121
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <contact ID>: àààààà àààà ààààààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1124
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1585,130 +1580,130 @@ msgstr ""
 "/help [<command>]: ààà ààààààà ààààààà ààààà. àà <command> ààààààààààà àààà ààà, "
 "ààààà ààààààà ààààà."
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1111
 #, c-format
 msgid "Usage: %s"
 msgstr "ààààà: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "Unknown command"
 msgstr "àààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1314
+#: ../libempathy-gtk/empathy-chat.c:1282
 msgid "Unknown command; see /help for the available commands"
 msgstr "àààààà àààà; àààààà ààààà àààà /help ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1539
 #, fuzzy
 #| msgid "Insufficient free space to save file"
 msgid "insufficient balance to send message"
 msgstr "àààà àààààààà àààà àààààà ààààà ààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
-#: ../libempathy-gtk/empathy-chat.c:1646
+#: ../libempathy-gtk/empathy-chat.c:1543 ../libempathy-gtk/empathy-chat.c:1557
+#: ../libempathy-gtk/empathy-chat.c:1620
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "àààààà '%s' ààààààààà ààà : %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
-#: ../libempathy-gtk/empathy-chat.c:1650
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1562
+#: ../libempathy-gtk/empathy-chat.c:1624
+#, c-format
 #| msgid "Error sending message '%s': %s"
 msgid "Error sending message: %s"
-msgstr "àààààà '%s' ààààààààà ààà : %s"
+msgstr "àààààààà ààààà ààààà ààà àààààà ààà: %s"
 
 #. translators: error used when user doesn't have enough credit on his
 #. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1577
+#: ../libempathy-gtk/empathy-chat.c:1551
 #, 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:1617
+#: ../libempathy-gtk/empathy-chat.c:1591
 msgid "not capable"
 msgstr "ààààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1624
+#: ../libempathy-gtk/empathy-chat.c:1598
 msgid "offline"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1627
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "invalid contact"
 msgstr "àààààà àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "permission denied"
 msgstr "ààààààà àà àààààà àààà àà"
 
-#: ../libempathy-gtk/empathy-chat.c:1633
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "too long message"
 msgstr "àààààà ààà ààààà àà"
 
-#: ../libempathy-gtk/empathy-chat.c:1636
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "not implemented"
 msgstr "ààààààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1640
+#: ../libempathy-gtk/empathy-chat.c:1614
 msgid "unknown"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1681 ../src/empathy-chat-window.c:969
 msgid "Topic:"
 msgstr "àààà:"
 
-#: ../libempathy-gtk/empathy-chat.c:1722
+#: ../libempathy-gtk/empathy-chat.c:1696
 #, c-format
 msgid "Topic set to: %s"
 msgstr "àààà ààààààà ààà: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1724
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, fuzzy, c-format
 #| msgid "Topic set to: %s"
 msgid "Topic set by %s to: %s"
 msgstr "àààà ààààààà ààà: %s"
 
 #. No need to display this 'event' is no topic can be defined anyway
-#: ../libempathy-gtk/empathy-chat.c:1729
+#: ../libempathy-gtk/empathy-chat.c:1703
 msgid "No topic defined"
 msgstr "àààà àààààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2245
+#: ../libempathy-gtk/empathy-chat.c:2219
 msgid "(No Suggestions)"
 msgstr "(ààààà ààà)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2313
+#: ../libempathy-gtk/empathy-chat.c:2287
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "àààààààààà '%s' àà ààààà"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2350
+#: ../libempathy-gtk/empathy-chat.c:2324
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "%s àààààààààà '%s' àà ààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2420
+#: ../libempathy-gtk/empathy-chat.c:2394
 msgid "Insert Smiley"
 msgstr "ààààààà àààà"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2438
-#: ../libempathy-gtk/empathy-ui-utils.c:1880
+#: ../libempathy-gtk/empathy-chat.c:2412
+#: ../libempathy-gtk/empathy-ui-utils.c:1179
 msgid "_Send"
 msgstr "ààààà (_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2495
+#: ../libempathy-gtk/empathy-chat.c:2469
 msgid "_Spelling Suggestions"
 msgstr "ààààà ààààà (_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2584
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Failed to retrieve recent logs"
 msgstr "ààààààààà ààààà ààààààà ààààààà àààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2723
+#: ../libempathy-gtk/empathy-chat.c:2719
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ààààààà ààà"
@@ -1716,12 +1711,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:2730
+#: ../libempathy-gtk/empathy-chat.c:2726
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s àààààà %1$s ààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2733
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ààà àààà ààà"
@@ -1729,17 +1724,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:2741
+#: ../libempathy-gtk/empathy-chat.c:2737
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s àààààà %1$s àààààààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2744
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%s was banned"
 msgstr "%s àààààààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-chat.c:2748
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ààààà ààààà àà"
@@ -1749,17 +1744,17 @@ msgstr "%s ààààà ààààà àà"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2757
+#: ../libempathy-gtk/empathy-chat.c:2753
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2782
+#: ../libempathy-gtk/empathy-chat.c:2778
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s àààààà ààààààà àà"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2803
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s à ààà %s ààààà àààààà àà"
@@ -1767,59 +1762,54 @@ 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:2994
-#: ../src/empathy-streamed-media-window.c:1888
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
+#: ../libempathy-gtk/empathy-chat.c:2990 ../src/empathy-call-window.c:1468
+#: ../src/empathy-call-window.c:1518 ../src/empathy-call-window.c:2571
+#: ../src/empathy-event-manager.c:1176
 msgid "Disconnected"
 msgstr "ààààààà ààà"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3658
+#: ../libempathy-gtk/empathy-chat.c:3665
 msgid "Would you like to store this password?"
 msgstr "ààà ààà à ààààààààà àààààààà ààààà àà?"
 
-#: ../libempathy-gtk/empathy-chat.c:3664
+#: ../libempathy-gtk/empathy-chat.c:3671
 msgid "Remember"
 msgstr "ààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:3674
+#: ../libempathy-gtk/empathy-chat.c:3681
 msgid "Not now"
 msgstr "ààààààà àààà"
 
-#: ../libempathy-gtk/empathy-chat.c:3718
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "ààà:ààààààà ààà"
-
-#: ../libempathy-gtk/empathy-chat.c:3722
+#: ../libempathy-gtk/empathy-chat.c:3729
 msgid "Wrong password; please try again:"
 msgstr "àààà ààààààà; àààààààà ààààà ààààà ààààààà ààà:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3852
+#: ../libempathy-gtk/empathy-chat.c:3859
 msgid "This room is protected by a password:"
 msgstr "à ààà ààààààà àààààà àààààààà àààà àà:"
 
-#: ../libempathy-gtk/empathy-chat.c:3879
+#: ../libempathy-gtk/empathy-chat.c:3886
+#: ../src/empathy-new-chatroom-dialog.c:780
 msgid "Join"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4078 ../src/empathy-event-manager.c:1197
 msgid "Connected"
 msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-chat.c:4126
+#: ../libempathy-gtk/empathy-chat.c:4133
 msgid "Conversation"
 msgstr "ààààààààà"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4131
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:4138
+#, c-format
 #| msgid "%s (%s)"
 msgid "%s (SMS)"
-msgstr "%s (%s)"
+msgstr "%s (SMS)"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
 msgid "Unknown or invalid identifier"
@@ -1841,414 +1831,344 @@ 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:506
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-individual-widget.c:1485
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "àààà:"
 
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
-#, fuzzy
 #| msgid "_Blocked Contacts"
 msgid "Blocked Contacts"
-msgstr "ààààà àààà ààààààà (_B)"
+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:104
+#| msgid "Full name:"
+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:105
+#| msgid "Phone number:"
+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:106
+#| msgid "E-mail address:"
+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:107
+#| msgid "Website:"
+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:108
+#| msgid "Birthday:"
+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 ""
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "Last seen:"
+msgstr "àààààà ààà (_L):"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "ààààà (_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+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:115
+#| msgid "Connected"
+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:119
+#, fuzzy
+#| msgid "Quit message:"
+msgid "Away message:"
+msgstr "àààààà àààà àà:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Network"
+msgid "work"
+msgstr "ààààà"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Volume"
+msgid "home"
+msgstr "àà"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "àààààà"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "àààà"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "àààààààààààà ààààà ààà (_B)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "ààààà ààààà ààà (_L)"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "àààààà"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:522
 msgid "Search contacts"
 msgstr "ààààààààà àààà"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search: "
 msgstr "àààà: "
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:610
 msgid "_Add Contact"
 msgstr "àààààààà ààààà (_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:628
 msgid "No contacts found"
 msgstr "ààààààà ààààà ààà"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:644
 msgid "Your message introducing yourself:"
 msgstr "ààààà àààààà ààààà ààààà ààààà ààà àà:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:652
 msgid "Please let me see when you're online. Thanks!"
 msgstr "àààààààà ààààà ààà àààà àà àààààà ààà àààààà àà. ààààà àààà!"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:567
+#: ../libempathy-gtk/empathy-contact-widget.c:560
 #: ../libempathy-gtk/empathy-individual-widget.c:304
-#, fuzzy
 #| msgid "Ca_ncel"
 msgid "Channels:"
-msgstr "àà ààà (_n)"
+msgstr "ààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:747
+#: ../libempathy-gtk/empathy-contact-widget.c:738
 #: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ààààà ISO ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-contact-widget.c:740
 #: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-contact-widget.c:742
 #: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-contact-widget.c:744
 #: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "àààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-contact-widget.c:746
 #: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-contact-widget.c:748
 #: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "àààààà ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-contact-widget.c:750
 #: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "àààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-contact-widget.c:752
 #: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "àààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-contact-widget.c:754
 #: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-contact-widget.c:756
 #: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-contact-widget.c:758
 #: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "àààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-contact-widget.c:760
 #: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "ààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-contact-widget.c:762
 #: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-contact-widget.c:764
 #: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "àààààààà àààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-contact-widget.c:766
 #: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-contact-widget.c:768
 #: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "ààà ààà (ààààà):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-contact-widget.c:770
 #: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "ààà ààà (ààààà):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-contact-widget.c:772
 #: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-contact-widget.c:774
 #: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "ààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-contact-widget.c:776
 #: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Climb ààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-contact-widget.c:778
 #: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "àààà àà àààààà ààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-contact-widget.c:780
 #: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "àààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:782
 #: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "ààààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-contact-widget.c:784
 #: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "àààààà:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:846
-#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-contact-widget.c:837
+#: ../libempathy-gtk/empathy-contact-widget.c:852
 #: ../libempathy-gtk/empathy-individual-widget.c:593
 #: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:35
+#: ../src/empathy-preferences.ui.h:39
 msgid "Location"
 msgstr "ààààà"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 #: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:906
 #: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %R UTC àà %Y"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:997
+#: ../libempathy-gtk/empathy-contact-widget.c:988
 #: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "ààààà àà àààààà ààà"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1053
+#: ../libempathy-gtk/empathy-contact-widget.c:1044
 #: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ààààà àà àààààà ààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
 #| msgid "Technical Details"
 msgid "Personal Details"
-msgstr "ààààààà ààààà"
+msgstr "ààààààààà ààààà"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1447
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 #: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "àààààà ààààà"
 
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-#, fuzzy
-#| msgid "Full name:"
-msgid "Full name"
-msgstr "ààààààà ààà:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-#, fuzzy
-#| msgid "Phone number:"
-msgid "Phone number"
-msgstr "ààà àààà:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-#, fuzzy
-#| msgid "E-mail address:"
-msgid "E-mail address"
-msgstr "àààà ààààààà:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-#, fuzzy
-#| msgid "Website:"
-msgid "Website"
-msgstr "ààààààà:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
-#, fuzzy
-#| msgid "Birthday:"
-msgid "Birthday"
-msgstr "àààààààà:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
-#, fuzzy
-#| msgid "_Last Name:"
-msgid "Last seen:"
-msgstr "àààààà ààà (_L):"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
-#, fuzzy
-#| msgid "Connected"
-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
-#, fuzzy
-#| msgid "Quit message:"
-msgid "Away message:"
-msgstr "àààààà àààà àà:"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
-#, fuzzy
-#| msgid "Network"
-msgid "work"
-msgstr "ààààààà"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
-#, fuzzy
-#| msgid "Volume"
-msgid "home"
-msgstr "ààààààà"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
-#| msgid "File"
-msgid "mobile"
-msgstr "àààààà"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
-#, fuzzy
-#| msgid "Favorite"
-msgid "voice"
-msgstr "ààààààà"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
-#, fuzzy
-#| msgid "Preferences"
-msgid "preferred"
-msgstr "ààààààà"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
-msgid "postal"
-msgstr "àààààà"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
-#, fuzzy
-#| msgid "Appearance"
-msgid "parcel"
-msgstr "àààààà"
-
 #. Identifier to connect to Instant Messaging network
-#. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1502
-msgid "Identifier:"
-msgstr "àààààààà:"
+#| msgid "Identifier:"
+msgid "Identifier"
+msgstr "àààààààà"
 
-#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-#: ../libempathy-gtk/empathy-individual-widget.c:1293
-msgid "Alias:"
-msgstr "ààààà:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "<b>Location</b> at (date)\t"
-msgstr "(ààààà) àà <b>ààààà</b>\t"
+#| msgid "Alias:"
+msgid "Alias"
+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 "àààààààà ààààààà"
 
 #: ../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:331
+#: ../libempathy-gtk/empathy-groups-widget.c:327
 msgid "Groups"
 msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:343
+#: ../libempathy-gtk/empathy-groups-widget.c:339
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2256,20 +2176,35 @@ msgstr ""
 "àààà àààà ààà àà ààà à àààààààà ààààààà àààààà ààà, ààààà àà ààà àà àààà ààààà àààà àààà "
 "àààà àààà àà àààà ààà ààà àà."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:358
 msgid "_Add Group"
 msgstr "ààà ààààà (_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:393
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "àààà ààà"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-roster-window.c:1970
+#: ../libempathy-gtk/empathy-groups-widget.c:403
 msgid "Group"
 msgstr "ààà"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "ààà àààààà"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "ààà %s àà ààààà àààà ààààà àà?"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
@@ -2282,166 +2217,187 @@ msgid_plural "The following identities can not be blocked:"
 msgstr[0] "àààààà ààààà ààààà àà àààà ààà:"
 msgstr[1] "àààààà àààààà ààààà àà àààà ààà:"
 
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "ààààà (_B)"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+#: ../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 "ààà àààà ààààààà"
 
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:332
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts ààààààà àààà ààà"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:335
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "àààààààà ààààà àààààà ààààààà àààààà àààà gnome-contacts àà ààààààà ààà."
+
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:173
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:345
+#: ../libempathy-gtk/empathy-individual-menu.c:347
 msgid "Select account to use to place the call"
 msgstr "ààààà ààààà ààààààà àààààà àààààà àààà ààà"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-individual-menu.c:351
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1290
 #: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "ààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:414
-#, fuzzy
+#: ../libempathy-gtk/empathy-individual-menu.c:416
 #| msgid "File"
 msgid "Mobile"
-msgstr "àààà"
+msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:416
+#: ../libempathy-gtk/empathy-individual-menu.c:418
 msgid "Work"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:418
+#: ../libempathy-gtk/empathy-individual-menu.c:420
 msgid "HOME"
 msgstr "àà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:659
+#: ../libempathy-gtk/empathy-individual-menu.c:661
 msgid "_Block Contact"
 msgstr "àààààààà ààààà ààà (_B)"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:717
+msgid "Delete and _Block"
+msgstr "àààà ààààà ààà ààààà ààà (_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:779
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "ààà ààààà ààà àààààààà '%s' ààà àààà ààààà àà?"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:788
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"ààà ààà ààààà ààà àààà àààààà '%s' àà ààà àààà ààààà àà? ààààà àà à ààà ààààààààà ààà àààà àà "
+"àà àààààààà ààà àààà àààààà àà."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:799
+msgid "Removing contact"
+msgstr "àààààà ààà ààà ààààà àà "
+
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-view.c:2454
+msgid "_Remove"
+msgstr "ààà ààà (_R)"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1018
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:1
+#: ../libempathy-gtk/empathy-individual-menu.c:1226
+#: ../libempathy-gtk/empathy-new-message-dialog.c:318
 msgid "_Chat"
 msgstr "àààààà (_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1053
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1261
+#: ../libempathy-gtk/empathy-new-message-dialog.c:312
 msgid "_SMS"
 msgstr "SMS (_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1086
+#: ../libempathy-gtk/empathy-individual-menu.c:1294
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "ààààà ààà (_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1119
+#: ../libempathy-gtk/empathy-individual-menu.c:1327
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "àààààà ààà (_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1160
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../libempathy-gtk/empathy-individual-menu.c:1368
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "àààààààà àààààààààà (_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1189
+#: ../libempathy-gtk/empathy-individual-menu.c:1397
 msgid "Send File"
 msgstr "àààààà ààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1219
+#: ../libempathy-gtk/empathy-individual-menu.c:1427
 msgid "Share My Desktop"
 msgstr "àààà àààààààààà àààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1245
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1453
+#: ../libempathy-gtk/empathy-individual-widget.c:1368
 msgid "Favorite"
 msgstr "ààààààà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1264
-#, fuzzy
-#| msgid "telepathy-salut not installed"
-msgid "gnome-contacts not installed"
-msgstr "telepathy-salut ààààààà àààà ààà"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1267
-msgid "Please install gnome-contacts to access contacts details."
-msgstr "àààààààà ààààà àààààà ààààààà àààààà àààà gnome-contacts àà ààààààà ààà."
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1398
+#: ../libempathy-gtk/empathy-individual-menu.c:1482
 msgid "Infor_mation"
 msgstr "ààààààà (_m)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1447
+#: ../libempathy-gtk/empathy-individual-menu.c:1531
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "àààààà ààà (_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1564
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1647
+#: ../src/empathy-chat-window.c:1235
 msgid "Inviting you to this room"
 msgstr "à àààààà àààà ààààààà ààà ààààà àà"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1610
+#: ../libempathy-gtk/empathy-individual-menu.c:1693
 msgid "_Invite to Chat Room"
 msgstr "ààààààààà ààà ààààààà ààà (_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1806
-#: ../src/empathy-roster-window-menubar.ui.h:5
+#: ../libempathy-gtk/empathy-individual-menu.c:1889
 msgid "_Add Contactâ"
 msgstr "àààààààà ààààà (_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:2374
 #, 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:2377
 msgid "Removing group"
 msgstr "ààààà ààà ààà"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2397
-#: ../libempathy-gtk/empathy-individual-view.c:2601
-msgid "_Remove"
-msgstr "ààà ààà (_R)"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2474
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "ààà ààààà ààà àààààààà '%s' ààà àààà ààààà àà?"
+#: ../libempathy-gtk/empathy-individual-view.c:2445
+#| msgid "Real name:"
+msgid "Re_name"
+msgstr "ààà àààà (_n)"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2483
-#, c-format
-msgid ""
-"Do you really want to remove the linked contact '%s'? Note that this will "
-"remove all the contacts which make up this linked contact."
-msgstr ""
-"ààà ààà ààààà ààà àààà àààààà '%s' àà ààà àààà ààààà àà? ààààà àà à ààà ààààààààà ààà àààà àà "
-"àà àààààààà ààà àààà àààààà àà."
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1304
+msgid "Alias:"
+msgstr "ààààà:"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2495
-msgid "Removing contact"
-msgstr "àààààà ààà ààà ààààà àà "
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1513
+msgid "Identifier:"
+msgstr "àààààààà:"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#: ../libempathy-gtk/empathy-individual-widget.c:1652
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2481,37 +2437,53 @@ msgstr "ààà ààààà"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:620
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:81
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:98
+msgid "People nearby"
+msgstr "àààà àààà"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:113
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit â Accounts</span> in the Contact List."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:675
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:697
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "àààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, fuzzy, c-format
 #| msgid "Call with %s"
 msgid "Chat in %s"
 msgstr "%s àààà ààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, fuzzy, c-format
 #| msgid "Call with %s"
 msgid "Chat with %s"
 msgstr "%s àààà ààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1200
-#: ../libempathy-gtk/empathy-log-window.c:1347
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1346
 #| msgid "%A %B %d %Y"
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
-msgstr "%A %B %d %Y"
+msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
 #: ../libempathy-gtk/empathy-log-window.c:1289
@@ -2526,130 +2498,122 @@ msgstr "<i>* %s %s</i>"
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-log-window.c:1370
+#, c-format
 #| msgid "%d second ago"
 #| msgid_plural "%d seconds ago"
 msgid "%s second"
 msgid_plural "%s seconds"
-msgstr[0] "%d ààààà àààà"
-msgstr[1] "%d àààààà àààà"
+msgstr[0] "%d ààààà"
+msgstr[1] "%d ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-log-window.c:1377
+#, c-format
 #| msgid "%d minute ago"
 #| msgid_plural "%d minutes ago"
 msgid "%s minute"
 msgid_plural "%s minutes"
-msgstr[0] "%d ààààà àààà"
-msgstr[1] "%d àààààà àààà"
+msgstr[0] "%d ààààà"
+msgstr[1] "%d ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1385
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1716
 msgid "Today"
 msgstr "ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1720
 #| msgid "Western"
 msgid "Yesterday"
-msgstr "ààààààà"
+msgstr "àààààà"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1735
 #| msgid "%A %B %d %Y"
 msgid "%e %B %Y"
-msgstr "%A %B %d %Y"
+msgstr "%e %B %Y"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1839
+#: ../libempathy-gtk/empathy-log-window.c:3462
 msgid "Anytime"
 msgstr "ààààà àààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:1938
+#: ../libempathy-gtk/empathy-log-window.c:2397
 #| msgid "None"
 msgid "Anyone"
-msgstr "àà àààà"
+msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2710
 msgid "Who"
 msgstr "ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2919
 msgid "When"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3037
 msgid "Anything"
 msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3039
 #, fuzzy
 #| msgid "Set status"
 msgid "Text chats"
 msgstr "ààààààààààà ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:25
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../src/empathy-preferences.ui.h:29
 #| msgid "Call"
 msgid "Calls"
 msgstr "ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3044
 #| msgid "Incoming call"
 msgid "Incoming calls"
 msgstr "ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3045
 #, fuzzy
 #| msgid "Outgoing voice call"
 msgid "Outgoing calls"
 msgstr "àààà ààààà àààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3046
 #, fuzzy
 #| msgid "Incoming call from %s"
 msgid "Missed calls"
 msgstr "%s ààààà ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3066
 #, fuzzy
 #| msgid "Chat"
 msgid "What"
 msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3755
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "ààà ààà ààààà àààààààà ààààààààààà ààà ààààà àààà àààààà ààààà àà?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
-#, fuzzy
+#: ../libempathy-gtk/empathy-log-window.c:3759
 #| msgid "C_lear"
 msgid "Clear All"
-msgstr "ààà ààà (_l)"
+msgstr "ààà ààà ààà"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3766
 msgid "Delete from:"
 msgstr "ààààààà àààà ààààà:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-#, fuzzy
 #| msgid "File"
 msgid "_File"
-msgstr "àààà"
+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)"
 
@@ -2662,13 +2626,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 "àààààà"
 
@@ -2680,139 +2643,135 @@ msgstr "ààààà 2"
 msgid "<span size=\"x-large\">Loading...</span>"
 msgstr "<span size=\"x-large\">àààà ààààà àà...</span>"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
-#, fuzzy
+#: ../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 "New account"
+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
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "àààààà ààà (_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+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 selected contact is offline."
 msgid "The contact is offline"
-msgstr "àààà àààà àààààà àààààà àà."
+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
 #, fuzzy
 #| msgid "Topic not supported on this conversation"
 msgid "The contact does not support this kind of conversation"
 msgstr "à àààààà àà àààà ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../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
 #, fuzzy
 #| msgid "You have been invited to join %s"
 msgid "You must be invited to join this channel"
 msgstr "àààà %s ààà àààààà àààà ààààààà ààà ààààààà ààààà àà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:102
 #, fuzzy
 #| msgid "Contact disconnected"
 msgid "Can't proceed while disconnected"
 msgstr "àààààà ààààààà ààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:104
 #| msgid "permission denied"
 msgid "Permission denied"
-msgstr "ààààààà àà àààààà àààà àà"
+msgstr "ààààààà ààààààà"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
-#, fuzzy
+#: ../libempathy-gtk/empathy-new-message-dialog.c:110
 #| msgid "There was an error while creating the account."
 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 "àààààà àààààààà àààà ààà àààààà àààà ààà:"
+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
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Video Call"
-msgid "_Video Call"
-msgstr "àààààà ààà (_V)"
-
-#. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:233
-#, fuzzy
-#| msgctxt "menu item"
-#| msgid "_Audio Call"
-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
-#, fuzzy, c-format
-#| msgid "Authentication failed"
-msgid "Authentification failed for account <b>%s</b>"
-msgstr "àààààààààà ààà àààààààà"
-
-#: ../libempathy-gtk/empathy-base-password-dialog.c:224
-#: ../libempathy-gtk/empathy-password-dialog.c:134
-#, c-format
-msgid ""
-"Enter your password for account\n"
-"<b>%s</b>"
-msgstr ""
-"àààà àààà ààààà ààààààààà àààà ààà\n"
-"<b>%s</b>"
-
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:165
+#: ../libempathy-gtk/empathy-presence-chooser.c:201
 msgid "Custom Messageâ"
 msgstr "ààààààà ààààà..."
 
+#: ../libempathy-gtk/empathy-presence-chooser.c:218
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messagesâ"
 msgstr "ààààààà àààààààààà àààààà ààà..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:342
 msgid "Click to remove this status as a favorite"
 msgstr "ààààààà ààààà à àààààààà ààà àààà àààà ààààà ààà"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:351
 msgid "Click to make this status a favorite"
 msgstr "à ààààààà àààààààà àààààà  àààà ààààà ààà"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:385
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:394
 msgid "Set status"
 msgstr "ààààààààààà ààààààà ààà"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1102
 msgid "Custom messagesâ"
 msgstr "ààààààà ààààààà..."
 
@@ -2820,26 +2779,28 @@ 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:610
 #, c-format
 msgid "New %s account"
 msgstr "ààà %s àààà"
 
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "àààà:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-#, fuzzy
 #| msgid "_Previous Tab"
 msgid "_Previous"
-msgstr "àààààààà ààà (_P)"
+msgstr "àààààààà (_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-#, fuzzy
 #| msgid "_Next Tab"
 msgid "_Next"
-msgstr "àààààà ààà (_N)"
+msgstr "àààààà (_N)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "Mat_ch case"
@@ -2893,33 +2854,36 @@ 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:1114
+#, 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:731
+msgid "_Decline"
+msgstr "àà ààààà (_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+#| msgid "Accept"
+msgid "_Accept"
+msgstr "àààààààà (_A)"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1126
 #, fuzzy, c-format
 #| msgid "Message received"
 msgid "Message edited at %s"
 msgstr "ààààà àààà àà"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
-#, fuzzy
+#: ../libempathy-gtk/empathy-theme-adium.c:1843
 #| msgid "N_ormal Size"
 msgid "Normal"
-msgstr "ààààààà ààà (_o)"
-
-#: ../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 "ààààà"
+msgstr "ààààààà"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
 msgid "The identity provided by the chat server cannot be verified."
@@ -2976,7 +2940,6 @@ msgid "Certificate hostname: %s"
 msgstr "àààààààààà àààààààà: %s"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:281
-#| msgid "Continue"
 msgid "C_ontinue"
 msgstr "àààà àààà (_o)"
 
@@ -2996,19 +2959,19 @@ msgstr "ààààààààà àààààà àààà à àà
 msgid "Certificate Details"
 msgstr "àààààààààà ààààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1754
+#: ../libempathy-gtk/empathy-ui-utils.c:1049
 msgid "Unable to open URI"
 msgstr "URI ààààà àààà àààààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1872
+#: ../libempathy-gtk/empathy-ui-utils.c:1173
 msgid "Select a file"
 msgstr "àààà àà àààà ààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1947
+#: ../libempathy-gtk/empathy-ui-utils.c:1247
 msgid "Insufficient free space to save file"
 msgstr "àààà àààààààà àààà àààààà ààààà ààààà"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1255
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -3017,11 +2980,21 @@ msgstr ""
 "%s ààààà ààààà ààààà à àààààà àààààààà àààà ààààà àà. ààààà àààà %s àààààà àà. àààààààà ààààà "
 "àààà ààààààà àààà ààà."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#: ../libempathy-gtk/empathy-ui-utils.c:1301
 #, c-format
 msgid "Incoming file from %s"
 msgstr "%s ààààà ààààààà àààà"
 
+#. 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 "àààààà ààààà"
@@ -3189,57 +3162,14 @@ msgstr "ààààààà"
 msgid "Vietnamese"
 msgstr "ààààààààà"
 
-#: ../libempathy-gtk/empathy-calendar-button.c:66
-#, fuzzy
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "Select..."
-msgstr "àààà ààà"
-
-#: ../libempathy-gtk/empathy-calendar-button.c:154
-#, fuzzy
-#| msgctxt "verb in a column header displaying group names"
-#| msgid "Select"
-msgid "_Select"
-msgstr "àààà ààà"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:231
 msgid "No error message"
 msgstr "ààà àààààà ààà"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:304
 msgid "Instant Message (Empathy)"
 msgstr "ààààààààà àààààà (Empathy)"
 
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "ààààààààà àà àààà àààà"
-
-#: ../src/empathy.c:439
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "ààààà àà àààààà àààà àààà ààààà àààà ààààààà ààààààà àààà"
-
-#: ../src/empathy.c:454
-msgid "- Empathy IM Client"
-msgstr "- Empathy IM àààààààà"
-
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "àààà àààààààà àààààà àààà àààà ààà"
-
-#: ../src/empathy.c:643
-#, c-format
-msgid ""
-"There was an error while trying to connect to the Telepathy Account Manager. "
-"The error was:\n"
-"\n"
-"%s"
-msgstr ""
-"àààààà Telepathy àààà àààààààà ààààà àààà ààààààà ààà ààààà ààà àààààà ààà ààà. ààà à "
-"ààà:\n"
-"\n"
-"%s"
-
 #: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
@@ -3282,82 +3212,103 @@ msgstr "GNOME àààà àààààà àààààààààà à
 msgid "translator-credits"
 msgstr "àààààààà àààààà <swkothar redhat com>"
 
+#: ../src/empathy-accounts.c:184
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "ààààà àààààààà ààààààà àààà; ààààà ààà ààà (ààà, àààà ààààààà) ààà àààà ààààà"
+
+#: ../src/empathy-accounts.c:188
+msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr ""
+
+#: ../src/empathy-accounts.c:192
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "àààààààà àààà àààààà àààà ààà (ààà, gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:194
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:199
+msgid "- Empathy Accounts"
+msgstr "- Empathy ààààà"
+
+#: ../src/empathy-accounts.c:242
+msgid "Empathy Accounts"
+msgstr "Empathy ààààà"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:70
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ààààà %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:76
+#: ../src/empathy-accounts-dialog.c:74
 msgid "Your new account has not been saved yet."
 msgstr "ààààà ààà àààà ààà àààààà àààà ààà."
 
-#: ../src/empathy-accounts-dialog.c:381
-#: ../src/empathy-streamed-media-window.c:759
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:403 ../src/empathy-call-window.c:1268
 msgid "Connectingâ"
 msgstr "ààààà ààààà àà..."
 
-#: ../src/empathy-accounts-dialog.c:422
+#: ../src/empathy-accounts-dialog.c:444
 #, c-format
 msgid "Offline â %s"
 msgstr "àààààà â %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:456
 #, c-format
 msgid "Disconnected â %s"
 msgstr "ààààà àààà ààà â %s"
 
-#: ../src/empathy-accounts-dialog.c:445
+#: ../src/empathy-accounts-dialog.c:467
 msgid "Offline â No Network Connection"
 msgstr "àààààà â ààààààà ààààà ààà"
 
-#: ../src/empathy-accounts-dialog.c:452
+#: ../src/empathy-accounts-dialog.c:474
 msgid "Unknown Status"
 msgstr "àààààà ààààààààà"
 
-#: ../src/empathy-accounts-dialog.c:469
+#: ../src/empathy-accounts-dialog.c:491
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
 "the account."
 msgstr ""
 
-#: ../src/empathy-accounts-dialog.c:479
+#: ../src/empathy-accounts-dialog.c:501
 msgid "Offline â Account Disabled"
 msgstr "àààààà â àààà ààààààààà àààà àà"
 
-#: ../src/empathy-accounts-dialog.c:585
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:607
 #| msgid "Connection managers should be used"
 msgid "Edit Connection Parameters"
-msgstr "ààààà ààààààààààà àààààà àààà àààà"
+msgstr "ààààà àààààààààà àààààà ààà"
 
-#: ../src/empathy-accounts-dialog.c:750
+#: ../src/empathy-accounts-dialog.c:770
 msgid "Failed to retrieve your personal information from the server."
 msgstr "àààààààààà ààààà ààààààààà ààààààààà ààààààà ààààààà àààààààà."
 
-#: ../src/empathy-accounts-dialog.c:756
+#: ../src/empathy-accounts-dialog.c:776
 msgid "Go online to edit your personal information."
 msgstr "ààààà ààààààààà àààààààààà àààààà àààà àààà àààààà ààà."
 
-#: ../src/empathy-accounts-dialog.c:843
+#: ../src/empathy-accounts-dialog.c:862
 msgid "_Edit Connection Parameters..."
 msgstr "ààààà àààààààààà àààààà ààà (_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:1358
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ààà ààà ààààà àààààààààààààà %s àà ààà àààà ààààà àà?"
 
-#: ../src/empathy-accounts-dialog.c:1343
+#: ../src/empathy-accounts-dialog.c:1362
 msgid "This will not remove your account on the server."
 msgstr "à ààààà àà ààààà àààààà ààà àààà àààà."
 
-#: ../src/empathy-accounts-dialog.c:1579
+#: ../src/empathy-accounts-dialog.c:1567
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3365,26 +3316,27 @@ msgstr ""
 "ààà àààà àààà àà àààà àààà àààà àà, àà ààààà àààààààà ààààà.\n"
 "ààà ààààà ààà àààà ààààà àà?"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1755
-msgid "_Enable"
-msgstr "àààààà ààà (_E)"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1758
+msgid "_Enabled"
+msgstr "àààààà àààà (_E)"
 
-#: ../src/empathy-accounts-dialog.c:1756
-msgid "_Disable"
-msgstr "ààààààààà ààà (_D)"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1781
+#| msgid "Real name:"
+msgid "Rename"
+msgstr "ààà àààà"
 
-#: ../src/empathy-accounts-dialog.c:2184
+#: ../src/empathy-accounts-dialog.c:2197
 msgid "_Skip"
 msgstr "àààà àà (_S)"
 
-#: ../src/empathy-accounts-dialog.c:2188
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:2201
 #| msgid "Connected"
 msgid "_Connect"
-msgstr "ààààààà"
+msgstr "àààààà (_C)"
 
-#: ../src/empathy-accounts-dialog.c:2365
+#: ../src/empathy-accounts-dialog.c:2380
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3409,10 +3361,9 @@ msgstr ""
 "ààààààà àà ààààààà àààà à àààà."
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-#, fuzzy
 #| msgid "No protocol installed"
 msgid "No protocol backends installed"
-msgstr "ààààààààà ààààààà àààà ààà"
+msgstr "àààààààààà ààààààààà ààààààà àààà ààà"
 
 #: ../src/empathy-auth-client.c:288
 msgid " - Empathy authentication client"
@@ -3422,122 +3373,152 @@ msgstr " - Empathy àààààààààà àààààààà"
 msgid "Empathy authentication client"
 msgstr "Empathy àààààààààà àààààààà"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
-msgid "- Empathy Audio/Video Client"
-msgstr "- Empathy ààààà/àààààà àààààààà"
+#: ../src/empathy.c:432
+msgid "Don't connect on startup"
+msgstr "ààààààààà àà àààà àààà"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy ààààà/àààààà àààààààà"
+#: ../src/empathy.c:436
+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:452
+msgid "- Empathy IM Client"
+msgstr "- Empathy IM àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:437
-msgid "Brightness"
-msgstr "ààààààààà"
+#: ../src/empathy.c:628
+msgid "Error contacting the Account Manager"
+msgstr "àààà àààààààà àààààà àààà àààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:440
-msgid "Gamma"
-msgstr "àààà"
+#: ../src/empathy.c:630
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"àààààà Telepathy àààà àààààààà ààààà àààà ààààààà ààà ààààà ààà àààààà ààà ààà. ààà à "
+"ààà:\n"
+"\n"
+"%s"
 
-#: ../src/empathy-streamed-media-window.c:547
-msgid "Volume"
-msgstr "ààààààà"
+#: ../src/empathy-call.c:195
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy ààààà/àààààà àààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1099
-msgid "_Sidebar"
-msgstr "àààààà ààààà (_S)"
+#: ../src/empathy-call.c:219
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy ààààà/àààààà àààààààà"
+
+#: ../src/empathy-call-observer.c:119
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s à àààà àààà ààà àààààà ààààààà ààààà ààà, ààààà ààà àààà àààààà àààààà ààà."
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1125 ../src/empathy-call-window.c:1141
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:1485 ../src/empathy-event-manager.c:510
+msgid "Incoming call"
+msgstr "ààààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:1119
-msgid "Audio input"
-msgstr "ààààà ààààà"
+#: ../src/empathy-call-window.c:1491 ../src/empathy-event-manager.c:915
+#, 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:1491 ../src/empathy-event-manager.c:518
+#: ../src/empathy-event-manager.c:915
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s ààààà ààààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:1131
-msgid "Dialpad"
-msgstr "Dialpad"
+#: ../src/empathy-call-window.c:1495
+#: ../src/empathy-notifications-approver.c:197
+msgid "Reject"
+msgstr "àà ààà"
 
-#: ../src/empathy-streamed-media-window.c:1142
-msgid "Details"
-msgstr "ààààà"
+#: ../src/empathy-call-window.c:1496
+#: ../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:1889
+#: ../src/empathy-call-window.c:1862
 #, c-format
 msgid "Call with %s"
 msgstr "%s àààà ààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2114
 msgid "The IP address as seen by the machine"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2116
 msgid "The IP address as seen by a server on the Internet"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2118
 msgid "The IP address of the peer as seen by the other side"
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2120
 msgid "The IP address of a relay server"
 msgstr "relay àààààààà IP ààààààà"
 
-#: ../src/empathy-streamed-media-window.c:1452
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2122
 msgid "The IP address of the multicast group"
 msgstr "àààààààààà àààààà 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
-#, fuzzy
-#| msgid "Unknown"
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2523 ../src/empathy-call-window.c:2524
+#: ../src/empathy-call-window.c:2525 ../src/empathy-call-window.c:2526
+#: ../src/empathy-call-window.ui.h:26
 msgid "Unknown"
 msgstr "àààààà"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2138
+#: ../src/empathy-call-window.c:2869
+msgid "On hold"
+msgstr ""
+
+#: ../src/empathy-call-window.c:2871
+msgid "Mute"
+msgstr "ààààà"
+
+#: ../src/empathy-call-window.c:2873
+#| msgid "Location"
+msgid "Duration"
+msgstr "ààààààà"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2876
 #, c-format
-msgid "Connected â %d:%02dm"
-msgstr "ààààààà â %d:%02dm"
+#| msgid "Connected â %d:%02dm"
+msgid "%s â %d:%02dm"
+msgstr "%s â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2199
-#: ../src/empathy-call-window.c:2992
+#: ../src/empathy-call-window.c:2972
 msgid "Technical Details"
 msgstr "ààààààà ààààà"
 
-#: ../src/empathy-streamed-media-window.c:2237
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3011
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ààà àààààààà ààààà ààààààààà àààààà ààààààà ààààà ààààà ààààààààà ààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2242
-#: ../src/empathy-call-window.c:3036
+#: ../src/empathy-call-window.c:3016
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ààà àààààààà ààààà ààààààààà àààààà ààààààà ààààà ààààà ààààààààà ààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:3042
+#: ../src/empathy-call-window.c:3022
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3546,23 +3527,19 @@ msgstr ""
 "%s ààà ààààààà ààààààà ààà ààààà ààà. ààà ààààààà àà àààà àààà àààà ààà àà àà àà àààà "
 "ààààààà ààààààà àààà ààà."
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:3048
+#: ../src/empathy-call-window.c:3028
 msgid "There was a failure on the network"
 msgstr "ààààà ààààààà àà àààààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2258
-#: ../src/empathy-call-window.c:3052
+#: ../src/empathy-call-window.c:3032
 msgid "The audio formats necessary for this call are not installed on your computer"
 msgstr "à ààà àààà ààààà àààà ààààààà àààààà ààààààààà àà ààààààà àààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2261
-#: ../src/empathy-call-window.c:3055
+#: ../src/empathy-call-window.c:3035
 msgid "The video formats necessary for this call are not installed on your computer"
 msgstr "à ààà àààà ààààà ààààà ààààààà àààààà ààààààààà àà ààààààà àààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2271
-#: ../src/empathy-call-window.c:3067
+#: ../src/empathy-call-window.c:3047
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3570,28 +3547,36 @@ msgid ""
 "the Help menu."
 msgstr ""
 
-#: ../src/empathy-streamed-media-window.c:2279
-#: ../src/empathy-call-window.c:3076
+#: ../src/empathy-call-window.c:3056
 msgid "There was a failure in the call engine"
 msgstr "ààààà ààà àààààààà àààààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2282
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-call-window.c:3059
 msgid "The end of the stream was reached"
 msgstr "àààààààààà àààà àààààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2322
-#: ../src/empathy-call-window.c:3119
+#: ../src/empathy-call-window.c:3099
 msgid "Can't establish audio stream"
 msgstr "ààààà ààààààààà ààààààà ààà àààà ààà"
 
-#: ../src/empathy-streamed-media-window.c:2332
-#: ../src/empathy-call-window.c:3129
+#: ../src/empathy-call-window.c:3109
 msgid "Can't establish video stream"
 msgstr "àààààà ààààààààà ààààààà ààà àààà ààà"
 
+#: ../src/empathy-call-window.c:3146
+#, c-format
+msgid "Your current balance is %s."
+msgstr "ààààà ààààààà ààà à %s àà."
+
+#: ../src/empathy-call-window.c:3150
+msgid "Sorry, you donât have enough credit for that call."
+msgstr ""
+
+#: ../src/empathy-call-window.c:3152
+msgid "Top Up"
+msgstr ""
+
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "ààà (_C)"
 
@@ -3600,33 +3585,27 @@ msgid "_Microphone"
 msgstr "àààààààààà (_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-#, fuzzy
 #| msgid "Camera On"
 msgid "_Camera"
-msgstr "àààààà àààà"
+msgstr "àààààà (_C)"
 
 #: ../src/empathy-call-window.ui.h:5
 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)"
 
@@ -3643,27 +3622,23 @@ msgid "Maximise me"
 msgstr "ààà ààààà ààà"
 
 #: ../src/empathy-call-window.ui.h:13
-#, fuzzy
 #| msgid "_Disable"
 msgid "Disable camera"
-msgstr "ààààààààà ààà (_D)"
+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 ""
 
 #: ../src/empathy-call-window.ui.h:16
-#, fuzzy
 #| msgctxt "menu item"
 #| msgid "_Video Call"
 msgid "Video call"
-msgstr "àààààà ààà (_V)"
+msgstr "ààààà ààà"
 
 #: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
@@ -3674,81 +3649,75 @@ msgid "Start an audio call"
 msgstr "ààààà ààà ààà ààà"
 
 #: ../src/empathy-call-window.ui.h:20
-#, fuzzy
 #| msgid "Dialpad"
 msgid "Show dialpad"
-msgstr "Dialpad"
+msgstr "ààààààààà ààààà"
 
 #: ../src/empathy-call-window.ui.h:21
 msgid "Display the dialpad"
 msgstr "ààààààààà ààààààà"
 
 #: ../src/empathy-call-window.ui.h:22
-#, fuzzy
-#| msgid "Send _Video"
-msgid "Send Video"
-msgstr "ààààà ààààà (_V)"
-
-#: ../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:2542 ../src/empathy-call-window.c:2543
-#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
-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:289
-#, fuzzy
+#: ../src/empathy-chat.c:106
+msgid "- Empathy Chat Client"
+msgstr "- Empathy ààààààààà àààààààà"
+
+#: ../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:282
 #| msgid "Hide the main window."
 msgid "Close this window?"
-msgstr "ààààà àààààààà àààààà."
+msgstr "ààà à àààààààà ààà àààà ààààà àà?"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:288
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr ""
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:301
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3759,69 +3728,68 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/empathy-chat-window.c:314
-#, fuzzy, c-format
+#: ../src/empathy-chat-window.c:312
+#, c-format
 #| msgid "Level "
 msgid "Leave %s?"
-msgstr "àààà "
+msgstr "ààà  %s àà ààààà ààààà àà?"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:314
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr ""
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:333
 msgid "Close window"
 msgstr "àààààà ààà ààà"
 
-#: ../src/empathy-chat-window.c:334
-#, fuzzy
+#: ../src/empathy-chat-window.c:333
 #| msgid "Level "
 msgid "Leave room"
-msgstr "àààà "
+msgstr "ààà àààà "
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:667 ../src/empathy-chat-window.c:690
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:682
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (ààà %u àààà)"
 msgstr[1] "%s (ààà %u ààààà)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:698
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:707
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:944
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:902
-#, fuzzy, c-format
+#: ../src/empathy-chat-window.c:952
+#, c-format
 #| msgid "Typing a message."
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
-msgstr[0] "ààààà àààà ààà ààààà àà."
-msgstr[1] "ààààà àààà ààà ààààà àà."
+msgstr[0] "%d àààààà ààààà ààààà àà"
+msgstr[1] "%d àààààà ààààà ààààà àà"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:972
 msgid "Typing a message."
 msgstr "ààààà àààà ààà ààààà àà."
 
@@ -3885,112 +3853,161 @@ msgstr "àààà ààà ààààà (_R)"
 msgid "_Detach Tab"
 msgstr "ààààà ààà àààà (_D)"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "ààà"
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "ààà àààà ààààà"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "ààà"
+#: ../src/empathy-debugger.c:74
+#| msgid "Empathy Debugger"
+msgid "- Empathy Debugger"
+msgstr "- Empathy ààààà"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "ààààà-àààààà"
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy ààààà"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "ààààààà ààààààà àààààààà ààà"
+#: ../src/empathy-debug-window.c:1603
+msgid "Save"
+msgstr "ààààààà"
+
+#: ../src/empathy-debug-window.c:1663
+msgid "Pastebin link"
+msgstr ""
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-debug-window.c:1672
+msgid "Pastebin response"
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1679
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr ""
+
+#: ../src/empathy-debug-window.c:1860
+msgid "Debug Window"
+msgstr "àààà àààààà"
+
+#: ../src/empathy-debug-window.c:1920
+msgid "Send to pastebin"
+msgstr "ààààààààààà ààààà"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Pause"
+msgstr "àààààà"
+
+#: ../src/empathy-debug-window.c:1976
+msgid "Level "
+msgstr "àààà "
+
+#: ../src/empathy-debug-window.c:1995
+msgid "Debug"
+msgstr "àààà"
+
+#: ../src/empathy-debug-window.c:2000
+msgid "Info"
+msgstr "ààààààà"
+
+#: ../src/empathy-debug-window.c:2005 ../src/empathy-debug-window.c:2054
+msgid "Message"
+msgstr "ààààà"
+
+#: ../src/empathy-debug-window.c:2010
+msgid "Warning"
+msgstr "àààààà"
+
+#: ../src/empathy-debug-window.c:2015
+msgid "Critical"
+msgstr "àààà"
+
+#: ../src/empathy-debug-window.c:2020
+msgid "Error"
+msgstr "ààà"
+
+#: ../src/empathy-debug-window.c:2039
+msgid "Time"
+msgstr "ààà"
+
+#: ../src/empathy-debug-window.c:2042
+msgid "Domain"
+msgstr "àààààà"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Category"
+msgstr "àààà"
+
+#: ../src/empathy-debug-window.c:2048
+msgid "Level"
+msgstr "àààà"
+
+#: ../src/empathy-debug-window.c:2077
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "àààà àààà ààààà àààààààààà àààààà ààààààà àààààààààààà àààà àààà ààà."
+
+#: ../src/empathy-event-manager.c:510
 msgid "Incoming video call"
 msgstr "ààààààà àààààà ààà"
 
-#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
-msgid "Incoming call"
-msgstr "ààààààà ààà"
-
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:514
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ààà ààà ààà ààààà àà, ààà ààà àààà àààà ààààà àà?"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:515
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s àààà àààààà ààààà àà. ààà ààà àààà àààà ààààà àà?"
 
-#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
-#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s ààààà ààààààà ààà"
-
-#: ../src/empathy-event-manager.c:555
+#: ../src/empathy-event-manager.c:543
 msgid "_Reject"
 msgstr "àà ààà (_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:551 ../src/empathy-event-manager.c:559
 msgid "_Answer"
 msgstr "àààà (_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:559
 msgid "_Answer with video"
 msgstr "àààààà àààà àààà ààà (_A)"
 
-#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
-#: ../src/empathy-call-window.c:1525
-#, c-format
-msgid "Incoming video call from %s"
-msgstr "%s ààààà ààààààà àààààà ààà"
-
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:714
 msgid "Room invitation"
 msgstr "ààà ààààààà"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:716
 #, c-format
 msgid "Invitation to join %s"
 msgstr "%s àààà àààààà ààààààà"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:723
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s à %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:736
 msgid "_Join"
 msgstr "àààà (_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:762
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s à %s àààà àààààà àààà ààààààà àààà àà"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:768
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "àààà %s ààà àààààà àààà ààààààà ààà ààààààà ààààà àà"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:947
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "%s ààààà ààààààà àààà àààààà"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:983 ../src/empathy-roster-window.c:224
 msgid "Password required"
 msgstr "ààààààà ààààà"
 
-#: ../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:1120
 #, c-format
 msgid ""
 "\n"
@@ -4111,10 +4128,9 @@ msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "àààà ààààà àààààà àààà, àà àààà ààà àààààà àààà àààà àààààààà ààà ààà"
 
 #: ../src/empathy-import-dialog.c:76
-#, fuzzy
 #| msgid "Import"
 msgid "_Import"
-msgstr "àààà ààà"
+msgstr "àààà ààà (_I)"
 
 #: ../src/empathy-import-dialog.c:88
 msgid ""
@@ -4129,235 +4145,92 @@ msgid "Import Accounts"
 msgstr "ààààà àà àààà ààà"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:303
 msgid "Import"
 msgstr "àààà ààà"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:312
 msgid "Protocol"
 msgstr "ààààààààà"
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:336
 msgid "Source"
 msgstr "ààààààà"
 
-#: ../src/empathy-roster-window.c:391
-msgid "Provide Password"
-msgstr "ààààààààà àààà àààà"
-
-#: ../src/empathy-roster-window.c:397
-msgid "Disconnect"
-msgstr "ààààà àààà"
-
-#: ../src/empathy-roster-window.c:657
-msgid "You need to setup an account to see contacts here."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:673
-msgid "No match found"
-msgstr "àààààààà ààààà ààà"
+#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:229
+msgid "Invite Participant"
+msgstr "àààààààà ààààààà ààà"
 
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts canât be used until your %s software is updated."
-msgstr ""
+#: ../src/empathy-invite-participant-dialog.c:202
+msgid "Choose a contact to invite into the conversation:"
+msgstr "àààààààààààà ààààààà àààà àààà àààààààà àààà ààà:"
 
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "àààààààà àààààà..."
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite"
+msgstr "ààààààà ààà"
 
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "ààà ààà"
+#: ../src/empathy-new-chatroom-dialog.c:194
+msgid "Chat Room"
+msgstr "àààààà ààà"
 
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "ààà:àààààà"
+#: ../src/empathy-new-chatroom-dialog.c:209
+msgid "Members"
+msgstr "ààààà"
 
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "ààààààà àààààà ààà"
+#: ../src/empathy-new-chatroom-dialog.c:410
+#| msgid "Failed to retrieve recent logs"
+msgid "Failed to list rooms"
+msgstr "ààààà àààà ààààààà àààààààà"
 
-#. Translators: this string will be something like:
-#. * Top up My Account ($1.23)..."
-#: ../src/empathy-roster-window.c:1110
+#: ../src/empathy-new-chatroom-dialog.c:439
 #, c-format
-msgid "Top up %s (%s)..."
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
 msgstr ""
+"%s\n"
+"ààààààà ààààà: %s\n"
+"ààààààà ààààà: %s\n"
+"ààààà: %s"
 
-#: ../src/empathy-roster-window.c:1156
-msgid "Top up account credit"
-msgstr ""
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
+msgid "Yes"
+msgstr "àà"
 
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr ""
+#: ../src/empathy-new-chatroom-dialog.c:441
+#: ../src/empathy-new-chatroom-dialog.c:442
+msgid "No"
+msgstr "àà "
 
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "àààààà"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-msgstr ""
-
-#. translators: argument is an account name
-#: ../src/empathy-roster-window.c:2158
-#, c-format
-msgid "You need to enable %s to see contacts here."
-msgstr ""
-
-#: ../src/empathy-roster-window.c:2460
-msgid "Contact List"
-msgstr "àààààà àààà"
-
-#: ../src/empathy-roster-window.ui.h:1
-#, fuzzy
-#| msgid "_Accounts"
-msgid "Account settings"
-msgstr "ààààà (_A)"
-
-#: ../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 "ààààà àààà ààààààà (_B)"
-
-#: ../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 "Avatars àààà ààààààà ààà (_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-roster-window-menubar.ui.h:25
-msgid "Join _Favorites"
-msgstr "àààààààààà àààà (_F)"
-
-#: ../src/empathy-roster-window-menubar.ui.h:26
-msgid "Manage Favorites"
-msgstr "àààààààààà àààààààààà ààà"
-
-#: ../src/empathy-new-chatroom-dialog.c:369
-msgid "Chat Room"
-msgstr "àààààà ààà"
-
-#: ../src/empathy-new-chatroom-dialog.c:385
-msgid "Members"
-msgstr "ààààà"
-
-#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
-#. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:637
-#, c-format
-msgid ""
-"%s\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"%s\n"
-"ààààààà ààààà: %s\n"
-"ààààààà ààààà: %s\n"
-"ààààà: %s"
-
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "àà"
-
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "No"
-msgstr "àà "
-
-#: ../src/empathy-new-chatroom-dialog.c:668
-msgid "Could not start room listing"
-msgstr "ààà ààààààà àà ààà ààà ààààà àààà"
-
-#: ../src/empathy-new-chatroom-dialog.c:678
-msgid "Could not stop room listing"
-msgstr "ààà ààààààà àà ààà ààà ààààà àààà"
+#: ../src/empathy-new-chatroom-dialog.c:784
+msgid "Join Room"
+msgstr "ààà àààà àààààà"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Join Room"
-msgstr "ààà àààà àààààà"
-
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid "Enter the room name to join here or click on one or more rooms in the list."
 msgstr "àààààà àààààà àààà ààà ààà àààà ààà àààà ààààààà àà àààà ààààà àààààà ààààà ààà."
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
+#: ../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
+#, fuzzy
+#| msgid ""
+#| "Enter the server which hosts the room, or leave it empty if the room is "
+#| "on the current account's server"
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr ""
+"ààààà àà àààà ààà àà àà àààààà àààààà àà, àààà àààà àààà àààà àà àà ààà à àààààà ààààààà "
+"ààààà àà ààà àà"
+
+#: ../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"
@@ -4365,187 +4238,223 @@ 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 "Preview"
+msgid "Provide"
+msgstr "àààà àààà"
+
+#: ../src/empathy-preferences.c:144
 msgid "Message received"
 msgstr "ààààà àààà àà"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:145
 msgid "Message sent"
 msgstr "ààààà àààààà àà"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:146
 msgid "New conversation"
 msgstr "ààà ààààààààà"
 
-#: ../src/empathy-preferences.c:169
-#, fuzzy
+#: ../src/empathy-preferences.c:147
 #| msgid "Contact goes online"
 msgid "Contact comes online"
-msgstr "àààààà àààààà ààà àà"
+msgstr "àààààà àààààà ààà àà"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:148
 msgid "Contact goes offline"
 msgstr "àààààà àààààà ààà àà"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:149
 msgid "Account connected"
 msgstr "àààà ààààààà àà"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:150
 msgid "Account disconnected"
 msgstr "àààà ààààààà ààà"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:387
 msgid "Language"
 msgstr "àààà"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
-#, fuzzy
+#: ../src/empathy-preferences.c:638
 #| msgid "Client:"
 msgid "Juliet"
-msgstr "àààààààà:"
+msgstr "àààààà"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
-#, fuzzy
+#: ../src/empathy-preferences.c:645
 #| msgid "Room"
 msgid "Romeo"
-msgstr "ààà"
+msgstr "àààààà"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:651
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:743
+#: ../src/empathy-preferences.c:655
 msgid "Deny thy father and refuse thy name;"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:746
+#: ../src/empathy-preferences.c:658
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:749
+#: ../src/empathy-preferences.c:661
 msgid "And I'll no longer be a Capulet."
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:752
+#: ../src/empathy-preferences.c:664
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr ""
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:755
-#, fuzzy
+#: ../src/empathy-preferences.c:667
 #| msgid "%s has disconnected"
 msgid "Juliet has disconnected"
-msgstr "%s ààààààà ààà"
+msgstr "ààààààààà ààààà àààà ààà"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1033
 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 list in rooms"
+msgid "Show groups"
+msgstr "àààà ààààà"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "àààààà"
+#| msgid "Your current balance is %s."
+msgid "Show account balances"
+msgstr "àààà àààààààà ààààà"
 
-#: ../src/empathy-preferences.ui.h:4
-msgid "Start chats in:"
-msgstr ""
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2134
+msgid "Contact List"
+msgstr "àààààà àààà"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "new ta_bs"
+msgid "Start chats in:"
 msgstr ""
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "new _windows"
-msgstr "ààà àààààà (_w)"
+msgid "new ta_bs"
+msgstr "ààà ààà (_b)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Display incoming events in the notification area"
-msgstr "àààà àààààààààà ààààààà ààààààà ààààààà"
+msgid "new _windows"
+msgstr "ààà àààààà (_w)"
 
 #: ../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 ""
 
-#: ../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 "
@@ -4553,11 +4462,11 @@ msgid ""
 "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 "
@@ -4567,370 +4476,421 @@ msgstr ""
 "àààààààà àààà ààà.  GPS ààààààà à ààààà ààààààà àààààà àààà."
 
 #. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
-#: ../src/empathy-preferences.ui.h:29
+#: ../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 (_G)"
 
-#: ../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 "ààààààà (_N) (IP, Wi-Fi)"
 
-#: ../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 "ààààààà àààà à ààà àà ààààààà àà ààààààà àààà àà àà àààà ààààààà àààà ààà ààà àà."
 
-#: ../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
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:44
 #| msgid "Bearing:"
 msgid "Variant:"
-msgstr "ààààà:"
+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:241
+msgid "Provide Password"
+msgstr "ààààààààà àààà àààà"
 
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "àààà ààààà (_Q)"
+#: ../src/empathy-roster-window.c:247
+msgid "Disconnect"
+msgstr "ààààà àààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "àààààà"
+#: ../src/empathy-roster-window.c:418
+msgid "You need to setup an account to see contacts here."
+msgstr "àààààà ààààà ààààààààà àààà àààà àààààà ààààààà àààààà àààà àà."
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "àààààà (_i)"
+#: ../src/empathy-roster-window.c:505
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr "àààààà àà, %s àààà ààààà àààà %s àààààààà ààààà àààà àààà àààà ààààà ààààà ààà."
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "àààààà ààà"
+#: ../src/empathy-roster-window.c:571
+msgid "Update software..."
+msgstr "àààààààà àààààà..."
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "ààààà àààààààààà"
+#: ../src/empathy-roster-window.c:577 ../src/empathy-roster-window.c:694
+msgid "Close"
+msgstr "ààà ààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "àààààà àààà"
+#: ../src/empathy-roster-window.c:682
+msgid "Reconnect"
+msgstr "ààà:àààààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "ààààà àààààààà ààà ààà"
+#: ../src/empathy-roster-window.c:688
+msgid "Edit Account"
+msgstr "ààààààà àààààà ààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "àààààà ààà"
+#: ../src/empathy-roster-window.c:868
+#, fuzzy
+#| msgid "New %s account"
+msgid "Top up account"
+msgstr "ààà %s àààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "àààààà ààààààààà ààà ààà ààààààà ààààààààà ààà ààà"
+#: ../src/empathy-roster-window.c:1530
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "àààààà ààààààààà àààà àààà ààààà ààààààà àààà ààààà àààààà àààààà àààà àà."
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "àààààààààà"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1538
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "àààààà ààààààààà àààà àààà ààààà %s àà àààààà àààààà àààà àà."
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "àààààà àààààà ààà ààààà ààààà ààààà àààà"
+#: ../src/empathy-roster-window.c:1902
+msgid "No match found"
+msgstr "àààààààà ààààà ààà"
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "àààààà àààà"
+#: ../src/empathy-roster-window-menubar.ui.h:1
+#| msgid "New Conversation"
+msgid "_New Conversation..."
+msgstr "ààà ààààààààà (_N)..."
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "àààààà àààààà ààà ààà ààààà ààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#| msgid "New Call"
+msgid "New _Call..."
+msgstr "ààà ààà (_C)..."
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "ààààà ààààà àà àààààà ààà"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#| msgid "Contact"
+msgid "Contacts"
+msgstr "ààààààà"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "ààààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:4
+#| msgid "_Add Contact"
+msgid "_Add Contacts..."
+msgstr "ààààààààà ààààà (_A)..."
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:5
+#| msgid "_Search for Contactsâ"
+msgid "_Search for Contacts..."
+msgstr "ààààààà àààà àààà (_S)..."
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "ààààà àààà ààààààà (_B)"
 
-#: ../src/empathy-debug-window.c:1680
-#, fuzzy, c-format
-#| msgid "%s:"
-msgid "%s"
-msgstr "%s:"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+#| msgid "_Room"
+msgid "_Rooms"
+msgstr "ààà (_R)"
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr ""
+#: ../src/empathy-roster-window-menubar.ui.h:8
+#| msgid "_Join"
+msgid "_Join..."
+msgstr "àààààà (_J)..."
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "àààà àààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "àààààààààà àààà (_F)"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "ààààààààààà ààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+#| msgid "Manage Favorites"
+msgid "_Manage Favorites"
+msgstr "àààààààààà àààààààààà ààà (_M)"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "àààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "ààààààà àààààà ààà àà (_F)"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "àààà "
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "ààààà (_A)"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "àààà"
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "ààààààà (_r)"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "ààààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:15
+#| msgid "_Help"
+msgid "Help"
+msgstr "ààà"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "ààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+#| msgid "Empathy"
+msgid "About Empathy"
+msgstr "Empathy àààà"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "àààààà"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "àààà ààààà (_Q)"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "àààà"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "àààà ààààààà"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "ààà"
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "ààà ààààààààà (_N)..."
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "ààà"
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "ààà ààà (_C)..."
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "àààààà"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "àààààà"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "àààà"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:173
+msgid "Done"
+msgstr "àààà ààà"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "àààà"
+#: ../ubuntu-online-accounts/cc-plugins/empathy-accounts-plugin-widget.c:181
+#| msgid "Enter your account details"
+msgid "Please enter your account details"
+msgstr "àààààààà ààààà ààààà àààà ààààààà àààà ààà"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "àààà àààà ààààà àààààààààà àààààà ààààààà àààààààààààà àààà àààà ààà."
+#~ msgid "Show avatars"
+#~ msgstr "àààààààà ààààà"
 
-#: ../src/empathy-invite-participant-dialog.c:202
-#: ../src/empathy-invite-participant-dialog.c:230
-msgid "Invite Participant"
-msgstr "àààààààà ààààààà ààà"
+#, fuzzy
+#~| msgid ""
+#~| "Whether or not to show avatars for contacts in the contact list and chat "
+#~| "windows."
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "ààààààà àààààà àààà ààà àààààà ààààààààà ààààààà àààà àààààààà ààààààà àà àààà."
 
-#: ../src/empathy-invite-participant-dialog.c:203
-msgid "Choose a contact to invite into the conversation:"
-msgstr "àààààààààààà ààààààà àààà àààà àààààààà àààà ààà:"
+#~ msgid "Show protocols"
+#~ msgstr "àààààààààààà ààààà"
 
-#: ../src/empathy-invite-participant-dialog.c:226
-msgid "Invite"
-msgstr "ààààààà ààà"
+#, fuzzy
+#~| msgid ""
+#~| "Whether or not to show avatars for contacts in the contact list and chat "
+#~| "windows."
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "ààààààà àààààà àààà ààà àààààà ààààààààà ààààààà àààà àààààààà ààààààà àà àààà."
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "ààààà àààààààà ààààààà àààà; ààààà ààà ààà (ààà, àààà ààààààà) ààà àààà ààààà"
+#~ msgid "Compact contact list"
+#~ msgstr "àààààà àààààà àààà"
 
-#: ../src/empathy-accounts.c:184
-msgid "Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr ""
+#, fuzzy
+#~| msgid "Whether to show the contact list in compact mode or not."
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "ààààààà ààààààà ààààààààà àààààààà ààààààà àà àààà."
 
-#: ../src/empathy-accounts.c:188
-msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "àààààààà àààà àààààà àààà ààà (ààà, gabble/jabber/foo_40example_2eorg0)"
+#, fuzzy
+#~| msgid "Contact list sort criterium"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "àààààà àààà ààààà àààà"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<account-id>"
+#, fuzzy
+#~| msgid ""
+#~| "Which criterium to use when sorting the contact list. Default is to use "
+#~| "sort by the contact's name with the value \"name\". A value of \"state\" "
+#~| "will sort the contact list by state."
+#~ 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-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Empathy ààààà"
+#~ msgid "Network:"
+#~ msgstr "ààààààà:"
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Empathy ààààà"
+#~ msgid "Password:"
+#~ msgstr "ààààààà:"
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "ààà àààà ààààà"
+#~ msgid "Port:"
+#~ msgstr "ààààà:"
 
-#: ../src/empathy-debugger.c:74
 #, fuzzy
-#| msgid "Empathy Debugger"
-msgid "- Empathy Debugger"
-msgstr "Empathy ààààà"
+#~| msgid "invalid contact"
+#~ msgid "â%sâ is not a valid contact ID"
+#~ msgstr "àààààà àààààà"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy ààààà"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %B %d %Y"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr "- Empathy ààààààààà àààààààà"
+#~ msgid "_Block User"
+#~ msgstr "àààààààààààà ààààà ààà (_B)"
 
-#: ../src/empathy-notifications-approver.c:189
-msgid "Respond"
-msgstr "ààààààààààà"
+#~ msgid "Decide _Later"
+#~ msgstr "ààààà ààààà ààà (_L)"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
-msgid "Reject"
-msgstr "àà ààà"
+#~ msgid "Classic"
+#~ msgstr "ààààà"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
-msgid "Answer"
-msgstr "àààà"
+#~ msgid "Simple"
+#~ msgstr "àààà"
 
-#: ../src/empathy-notifications-approver.c:213
-msgid "Answer with video"
-msgstr "àààààà àààà àààà ààà"
+#~ msgid "Clean"
+#~ msgstr "ààà ààà"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
-msgid "Decline"
-msgstr "àà ààààà"
+#~ msgid "Blue"
+#~ msgstr "ààààà"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
-msgid "Accept"
-msgstr "àààààààà"
+#~ msgid "_Enable"
+#~ msgstr "àààààà ààà (_E)"
 
-#. translators: the 'Provide' button is displayed in a notification
-#. * bubble when Empathy is asking for an account password; clicking on it
-#. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:246
-#, fuzzy
-#| msgid "Preview"
-msgid "Provide"
-msgstr "àààààààààà"
+#~ msgid "_Disable"
+#~ msgstr "ààààààààà ààà (_D)"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s à àààà àààà ààà àààààà ààààààà ààààà ààà, ààààà ààà àààà àààààà àààààà ààà."
+#~ msgid "Contrast"
+#~ msgstr "ààà"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
-msgid "i"
-msgstr "i"
+#~ msgid "Brightness"
+#~ msgstr "ààààààààà"
 
-#: ../src/empathy-call-window.c:2888
-msgid "On hold"
-msgstr ""
+#~ msgid "Gamma"
+#~ msgstr "àààà"
 
-#: ../src/empathy-call-window.c:2891
-msgid "Mute"
-msgstr "ààààà"
+#~ msgid "Volume"
+#~ msgstr "ààààààà"
 
-#: ../src/empathy-call-window.c:2893
-#, fuzzy
-#| msgid "Location"
-msgid "Duration"
-msgstr "ààààà"
+#~ msgid "_Sidebar"
+#~ msgstr "àààààà ààààà (_S)"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2896
-#, fuzzy, c-format
-#| msgid "Connected â %d:%02dm"
-msgid "%s â %d:%02dm"
-msgstr "ààààààà â %d:%02dm"
+#~ msgid "Audio input"
+#~ msgstr "ààààà ààààà"
 
-#: ../src/empathy-call-window.c:3166
-#, c-format
-msgid "Your current balance is %s."
-msgstr "ààààà ààààààà ààà à %s àà."
+#~ msgid "Video input"
+#~ msgstr "àààààà ààààà"
 
-#: ../src/empathy-call-window.c:3170
-msgid "Sorry, you donât have enough credit for that call."
-msgstr ""
+#~ msgid "Dialpad"
+#~ msgstr "Dialpad"
 
-#: ../src/empathy-call-window.c:3172
-msgid "Top Up"
-msgstr ""
+#~ msgid "Details"
+#~ msgstr "ààààà"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr ""
+#, fuzzy
+#~| msgid "Unknown"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ msgstr "àààààà"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "àààà ààààààààà àààààà àààà ààààà àààà àà?"
+#~ msgid "Connected â %d:%02dm"
+#~ msgstr "ààààààà â %d:%02dm"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
 #, fuzzy
-#| msgid "New account"
-msgid "Adding new account"
-msgstr "ààà àààà"
+#~| msgid "Send _Video"
+#~ msgid "Send Video"
+#~ msgstr "ààààà ààààà (_V)"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "àààà àààà"
+#~ msgid "Send Audio"
+#~ 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 "_Offline Contacts"
+#~ msgstr "àààààà ààààààààà (_O)"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
-msgid ""
-"You can change these details later or disable this feature by choosing <span "
-"style=\"italic\">Edit â Accounts</span> in the Contact List."
-msgstr ""
+#~ msgid "Show P_rotocols"
+#~ msgstr "àààààààààààà ààààà (_r)"
+
+#~ msgid "Contacts on a _Map"
+#~ msgstr "ààààà àà ààààààà (_M)"
+
+#~ msgid "Find in Contact _List"
+#~ msgstr "àààààà ààààààà àààà (_L)"
+
+#~ msgid "Sort by _Name"
+#~ msgstr "ààà ààà ààààà ààà (_N)"
+
+#~ msgid "Sort by _Status"
+#~ msgstr "àààààà àààààà ààààààà àààà (_S)"
+
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "Avatars àààà ààààààà ààà (_A)"
+
+#~ msgid "N_ormal Size"
+#~ msgstr "ààààààà ààà (_o)"
+
+#~ msgid "_Compact Size"
+#~ msgstr "ààààààà ààà (_C)"
+
+#~ msgid "_Joinâ"
+#~ msgstr "àààààà (_J)..."
+
+#~ msgid "Could not start room listing"
+#~ msgstr "ààà ààààààà àà ààà ààà ààààà àààà"
+
+#~ msgid "Could not stop room listing"
+#~ msgstr "ààà ààààààà àà ààà ààà ààààà àààà"
+
+#~ msgid "Appearance"
+#~ msgstr "àààààà"
+
+#~ msgid "Redial"
+#~ msgstr "àààààà"
+
+#~ msgid "V_ideo"
+#~ msgstr "àààààà (_i)"
+
+#~ msgid "Video Off"
+#~ msgstr "àààààà ààà"
+
+#~ msgid "Video Preview"
+#~ msgstr "ààààà àààààààààà"
+
+#~ msgid "Video On"
+#~ msgstr "àààààà àààà"
+
+#~ msgid "Call the contact again"
+#~ msgstr "ààààà àààààààà ààà ààà"
+
+#~ msgid "Camera Off"
+#~ msgstr "àààààà ààà"
+
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "àààààà ààààààààà ààà ààà ààààààà ààààààààà ààà ààà"
+
+#~ msgid "Preview"
+#~ msgstr "àààààààààà"
+
+#~ msgid "Enable camera but don't send video"
+#~ msgstr "àààààà àààààà ààà ààààà ààààà ààààà àààà"
+
+#~ msgid "Camera On"
+#~ msgstr "àààààà àààà"
+
+#~ msgid "Enable camera and send video"
+#~ msgstr "àààààà àààààà ààà ààà ààààà ààààà"
+
+#~ msgid "Contact Map View"
+#~ msgstr "ààààà ààààà àà àààààà ààà"
 
 #~ msgid "Socket type not supported"
 #~ msgstr "ààààà àààààà ààààààà ààà"
@@ -4947,9 +4907,6 @@ msgstr ""
 #~ msgid "Launch My Web Accounts"
 #~ msgstr "àààà ààà ààààààà ààà ààà"
 
-#~ msgid "_Enabled"
-#~ msgstr "àààààà àààà (_E)"
-
 #~ msgid "Personal Information"
 #~ msgstr "ààààààààà ààààààà"
 
@@ -5065,9 +5022,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 "ààà àààà ààààààààà àààààà àààààà àààààà ààààà àà?"
 



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