[empathy] Updated Serbian translation



commit 3a918bcb64fe3dd8b6cc1c6be6f74bd940a32ac4
Author: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>
Date:   Thu Feb 9 11:58:59 2012 +0100

    Updated Serbian translation

 po/sr.po       | 3778 ++++++++++++++++++++++++++++++--------------------------
 po/sr latin po | 3700 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 3987 insertions(+), 3491 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 6936356..0dc2f7e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -11,524 +11,547 @@
 # Reviewed on 11.05.2009 by ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>
 # ÐÐÐÐÑ ÐÐÐÐÐÐÑ <gpopac gmail com>, 2010.
 # ÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÑ <branko kokanovic gmail com>, 2011.
-# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011.
+# ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath";
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-08 15:44+0000\n"
+"PO-Revision-Date: 2012-02-09 11:53+0200\n"
 "Last-Translator: ÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÑ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"ÐÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÑ, ÐÐÑÑÐÑÐÑ, ÐÐÐ-Ñ Ð ÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐÐ ÑÐÑÐÐÑÐÐÐ ÐÐ "
-"ÑÐÑÐÐÑÐ"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÐ"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÑÐÐÐ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÐ"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"ÐÐÑÐÐÑÑÐ ÐÐ ÐÑÐÐ ÑÐÐÐÐÐÐÑÑ, ÐÐÑÑÐÑÐÑ, ÐÐÐ-Ñ Ð ÐÐ ÐÐÐÐÐÐ ÐÑÑÐÐÐ ÑÐÑÐÐÑÐÐÐ ÐÐ "
+"ÑÐÑÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "ÐÐÐÐ ÐÑÐÐÑÐ ÐÐÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
+msgid "Connection managers should be used"
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÐÐÐ ÐÑÐÐÐÐ"
 
+# ÐÐÑÐ connect ÐÐÑ disconnect!!! ~ÐÐÐÐÑ
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐ"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"ÐÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÑÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐ "
+"ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐ, Ñ ÐÑÐÑÐÐÑÐÐÐ."
+msgid "Empathy should auto-connect on startup"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐ ÑÑÐÐÑÑÐÐÐÑÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÑÐÑÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "ÐÑÐÑÐÑ ÐÐÐÐÑÐÑÐ"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐ ÑÐÐ ÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÑÐ"
+msgid "Empathy should auto-away when idle"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐ Ñ ÑÑÐÑÐ ÐÑÑÐÐÐÑÑÐÐÐ ÐÐÑÑÑÑÐÐ Ñ ÐÐÑÐÐÐÑÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"ÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ "
-"(ÑÐÐ) Ñ ÐÑÑÐÐÐÐ ÑÐÑÐÐÑÐÐÐ."
+"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÑÐ Ñ ÑÑÐÑÐ ÐÐÑÑÑÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
+msgid "Empathy default download folder"
+msgstr "ÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "ÐÐÑÐÑÐÐÑÐ ÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
+msgid "The default folder to save file transfers in."
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÑÐ ÐÑÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"ÐÐÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ (ÐÐÑ. âsr, en, "
-"frâ)."
+msgid "Show offline contacts"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÐ ÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ ÑÐÑÐÐÐÐÐ ÐÑÐÐÐÐ"
+msgid "Show avatars"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "ÐÑÐÑÐÑÐÑÑÐ ÐÐ ÑÐÑÑÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐ ÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ Ð ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ Ñ ÐÐÐÐÐ ÐÐÐÐÐÐÐÐ, ÐÐÑ. â/dev/"
-"video0â."
+msgid "Show protocols"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑ ÑÐÐÐÐ"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐ ÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ Ð ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "ÐÑÐÑÑÑÑÑÐ ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÑÐÐ"
+msgid "Show Balance in contact list"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÐÐÐÑ ÐÐ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÑÐÐ"
+msgid "Whether to show account balances in the contact list."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ ÑÑÐÑÐ"
+msgid "Compact contact list"
+msgstr "ÐÐÐÑÐÐÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ ÑÑÐÑÐ. ÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ, ÐÐÐÐÑ ÐÑ "
-"ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐÑ."
+msgid "Whether to show the contact list in compact mode."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "ÐÐÐÑÑÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐ"
+msgid "Hide main window"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÑÐÐÐÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÑÐÐÐÐ"
+msgid "Hide the main window."
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÑÐÐÐÑ ÐÑÐÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
+msgid "Default directory to select an avatar image from"
+msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÑ ÑÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
+msgid "Open new chats in separate windows"
+msgstr "ÐÑÐÐÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ Ñ ÑÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "ÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐÑÐ"
+msgid "Always open a separate chat window for new chats."
+msgstr "ÐÐÐÐ ÐÑÐÐÑÐ ÐÐÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐ ÐÐÐÐ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "ÐÐÑÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ"
+msgid "Display incoming events in the status area"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ ÑÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐ Ñ ÑÑÐÑÐ ÐÑÑÐÐÐÑÑÐÐÐ ÐÐÑÑÑÑÐÐ Ñ ÐÐÑÐÐÐÑÑ"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ ÑÑÐÑÐ. ÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ, ÐÐÐÐÑ ÐÑ "
+"ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐ ÑÑÐÐÑÑÐÐÐÑÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÑÐÑÑ"
+msgid "The position for the chat window side pane"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÑÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐ ÐÑÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ (Ñ ÑÐÑÐÐÐÐ) ÐÐÑÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÑÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÑÑ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
+msgid "Contact list sort criterion"
+msgstr "ÐÑÐÑÐÑÐÑÑÐ ÐÐ ÑÐÑÑÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÐÑÐÐ ÐÐÐÑÐ"
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"ÐÐÑÐ ÐÑÐÑÐÑÐÑÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÑÐÑÑÐÑÐÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ. ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ "
+"ÐÐÑÐÑÑÐ âstateâ (ÑÐÑÑÐÑÐÑÐ ÐÐ ÑÑÐÑÑ ÐÑÐÑÐÑÐÑÐ). ÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑ ânameâ, "
+"ÑÐÑÑÐÑÐÑÐ ÑÐ ÐÑÑÐ ÐÐ ÐÐÐÐÑ ÐÑÐÑÐÑÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
+msgid "Use notification sounds"
+msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÑÑ ÐÐÑÐÑÐ"
+msgid "Whether to play a sound to notify of events."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÑÐÐÐÑ"
+msgid "Disable sounds when away"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÑÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐ ÐÑÐÐÐÑ ÐÑÐÐÑÐÐÐ."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐÑÑÑÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "ÐÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
+msgid "Play a sound for incoming messages"
+msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "ÐÑÐÐÑÐ ÐÐÐÐ ÑÐÑÐÐÑÐ Ñ ÑÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐÑÐÐÐ"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÐ ÑÑÐÐÐÐ ÐÐÑÑÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "ÐÑÑÐÑÐ ÐÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ"
+msgid "Play a sound for outgoing messages"
+msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"ÐÑÑÐÑÐ ÐÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ."
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÑÐÐ"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÑ."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÑÐÑÐÐÐ"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑÐ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÑ."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÑÐ ÐÑÐÑÐÐÐÐ"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÑÐ ÐÐÑÐÐÐÐ"
+msgid "Play a sound when we log in"
+msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÑÐ ÐÑÐÑÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ Ñ ÑÐÐÑÑÑ"
+msgid "Whether to play a sound when logging into a network."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÑÐÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÑÐÑÐÐÐ"
+msgid "Play a sound when we log out"
+msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÑÐ ÐÐÑÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐ"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÑÐ ÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐÐÐ."
+msgid "Enable popup notifications for new messages"
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÑÑÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÑÐÐÐÐÑ ÐÐ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐ"
+msgid "Disable popup notifications when away"
+msgstr "ÐÑÐÑÑÑÑÑÐ ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐ ÐÐÑÑÑÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐÐ"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐÑÑÑÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ Ñ ÑÐÐÑÑÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÐ ÐÑÐÐÐ"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐ Ð ÐÐÐÐ ÑÐ "
+"ÐÑÐÐÐÑ ÐÐ ÑÐÑÐÐÑÐ ÐÑÐÐÑÐÐ, ÐÐÐ ÐÐÑÐ Ñ ÑÐÐÑÑÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÐÑÐÑÐÐÐÐÐ"
+msgid "Pop up notifications when a contact logs in"
+msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÑÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑ ÐÐÑÐÑÐ"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÑÑÐÐÑÐ ÐÑÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ."
+msgid "Pop up notifications when a contact logs out"
+msgstr "ÐÑÐÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "ÐÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐ."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "ÐÐÐÐÐÐÑ ÐÐÑÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
+msgid "Use graphical smileys"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÑÑ ÑÐ ÑÐÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ (Ñ ÑÐÑÐÐÐÐ) ÐÐÑÐÐ ÐÐÐÑÑÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐ ÑÐÐÑÐÑÐ ÑÐÑÑÐÑ ÑÐÐÐÐÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "ÐÐÐÐ ÐÐ ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑÐ Ñ ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
+msgid "Show contact list in rooms"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "ÐÐÑÐÑÐÐÑÐ ÑÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑÐ Ñ ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÑÑ ÑÐ ÑÐÐÑÐÐÐ"
+msgid "Chat window theme"
+msgstr "ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "ÐÐÑÐÑÑÐ ÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐÑÑÐÑÐ"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "ÐÐÐÐ ÐÐ ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑÐ Ñ ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐ ÑÐÐÐ ÑÐÑÐÐÑÐ"
+msgid "Chat window theme variant"
+msgstr "ÐÐÑÐÑÐÐÑÐ ÑÐÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐÐÐ."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "ÐÐÑÐÑÐÐÑÐ ÑÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑÐ Ñ ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ."
+msgid "Path of the Adium theme to use"
+msgstr "ÐÑÑÐÑÐ ÐÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"ÐÑÑÐÑÐ ÐÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÐÐÑÐÑÑÐÑÐ, ÐÐÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐÐÑÑÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ."
+msgid "Enable WebKit Developer Tools"
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÐÑÐÐ ÐÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÐÑÐÐ ÐÐÐÑÐ, ÐÐÐ ÑÑÐ ÑÐ ÐÐÐ ÐÐÑÐÐÐÑÐÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐ ÑÐÐ ÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ."
+msgid "Use theme for chat rooms"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐ ÐÐ ÑÐÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÑÐ Ñ ÑÑÐÑÐ ÐÐÑÑÑÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÐÐÐÑÐ."
+msgid "Whether to use the theme for chat rooms."
+msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÑ ÐÐ ÑÐÐÐ ÑÐÐÐÐÐÐÑÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐ ÐÑÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐÐÑÑÐ."
+msgid "Spell checking languages"
+msgstr "ÐÐÐÐÑÐ ÐÐ ÐÑÐÐÐÑÑ ÐÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÑÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÑ Ñ ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
+"ÐÐÐÑÐÐ ÑÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÑÑÐ ÐÑÐÐÐÑÐ ÐÑÐÐÐÐÐÑÐ (ÐÐÑ. âsr, en, "
+"frâ)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑÑÐÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÐÑÐÐ ÐÐÐÑÐ, ÐÐÐ ÑÑÐ ÑÐ ÐÐÐ ÐÐÑÐÐÐÑÐÑ."
+msgid "Enable spell checker"
+msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÐÐÑÑ ÐÐÑÐÑÐ"
 
-# ÐÐÑÐ connect ÐÐÑ disconnect!!! ~ÐÐÐÐÑ
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"ÐÐ ÐÐ ÑÑÐÐÐ ÐÐÑÐÑÑÐÑÐ ÑÐÑÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÐ "
-"ÑÑÐÐÑÑÐÐÑÐÑÐ ÐÐÐÐ."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÑÐÐÐ ÐÐÑÐÑÐ ÑÐÑÐ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐÐ."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "ÐÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÐÐ ÑÐÐÑÐÑÐ ÑÐÑÑÐÑ ÑÐÐÐÐÐÐÑÐ."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"ÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐ ÑÐ ÐÐÑÐÑÑÐ ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÑÑÐÐÐÑÐ ÐÐÐÐÐÐÐ "
+"(ÑÐÐ) Ñ ÐÑÑÐÐÐÐ ÑÐÑÐÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÑÐÑÑÑÐÐ ÑÐÐÑÐÑ ÐÑÐÑÐ ÐÑÐÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐ."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÐÑ ÐÑÐÑÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÑÑ ÐÑÐÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-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:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐ."
+msgid "Last account selected in Join Room dialog"
+msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐ Ñ ÐÑÐÐÐÑÑÐÑÑ ÐÐ ÐÑÐÐÑÑÐÐÐÐÑÐ ÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "ÐÑÑÐÑÐ ÐÐÑÐÐÑÐ Ð-ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÐÑÐ ÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÐ ÑÑÐÐÐÐ ÐÐÑÑÐÐ."
+msgid "Camera device"
+msgstr "ÐÑÐÑÐÑ ÐÐÐÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÑ."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ Ñ ÐÐÐÐÐ ÐÐÐÐÐÐÐÐ, ÐÐÑ. â/dev/"
+"video0â."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÐÑÐÑÐ ÐÐÑÑÐÑ."
+msgid "Camera position"
+msgstr "ÐÐÐÐÐÐÑ ÐÐÐÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÐÐÑÐ ÐÐ ÐÑÐÐÑ."
+msgid "Position the camera preview should be during a call."
+msgstr "ÐÐÐÐÐÐÑ ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÑÐ ÐÐÐÐ ÑÐ ÐÐÑÐÐÐÑÐ ÑÐ ÐÑÐÐÐ."
+msgid "Echo cancellation support"
+msgstr "ÐÐÐÑÑÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐÑÑÑÐÐ."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐ ÑÐÑÑÑÐÐ ÑÐÐÑÐÑ ÐÑÐÑÐ ÐÑÐÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐÐÐ ÑÐ ÐÑÐÐÐ."
+msgid "Show hint about closing the main window"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÑ Ñ ÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÑ."
+"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÐÑ Ð ÐÐÑÐÐÑÐÑÑ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐ "
+"âxâ ÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÑÐ ÐÑÐÑÑÐÐÐÐÐ ÐÐÑÑÐÐÐÐ ÑÐÐ Ð ÐÐÐÐ ÑÐ "
-"ÐÑÐÐÐÑ ÐÐ ÑÐÑÐÐÑÐ ÐÑÐÐÑÐÐ, ÐÐÐ ÐÐÑÐ Ñ ÑÐÐÑÑÑ."
+msgid "Empathy can publish the user's location"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÑÐÐÐÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÑ ÐÐÑÑÐÑ."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÑÑÑÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÑÐÐÐÐ ÑÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐÐÐ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑ ÐÐÑÐÐÐÐÐ ÐÐÐÐÐÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ."
+msgid "Empathy can use the network to guess the location"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐ ÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ Ð ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÐÑÑÑÐÐ."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÑ ÐÑÐÐÑ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÐÐ ÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ Ð ÐÑÐÐÐÑÑ ÑÐÑÐÐÑÐ."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÐÐ ÐÐ ÐÐÑÐÑÑÐ ÐÐÐ ÐÐ ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÑ."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ Ñ ÐÐÐÑÐÐÐÐ ÑÐÐÐÐÑ."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐ ÐÑÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"ÐÐ ÐÐ ÐÐ ÐÑÐÐÐÐÑÑÐ ÐÐÑÑÐÑ Ð ÐÐÑÐÐÑÐÑÑ ÐÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑÐ ÐÐ "
-"âxâ ÐÑÐÐÐ."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "ÐÐ ÐÐ ÐÐ ÐÐÑÐÑÑÐ ÑÐÐÑ ÐÐ ÑÐÐÐ ÑÐÐÐÐÐÐÑÐ."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"ÐÐÑÐ ÐÑÐÑÐÑÐÑÑÐ ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÑÐÑÑÐÑÐÑÐ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ. ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÐ "
-"ÐÐÑÐÑÑÐ ânameâ (ÑÐÑÑÐÑÐÑÐ ÐÐ ÐÐÐÐÑ ÐÑÐÑÐÑÐÑÐ). ÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑ âstateâ, "
-"ÑÐÑÑÐÑÐÑÐ ÑÐ ÐÑÑÐ ÐÐ ÑÑÐÑÑ ÐÑÐÑÐÑÐÑÐ."
+"ÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐ ÐÑÐÑÐÐÐÐÑÑ ÐÐÐÐÑÐÑÐ ÐÐÐÐ ÐÐÐÐÑÐÐÐ ÐÑÐÐÐÑÐÐÑÑÐ."
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ Ð VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "ÐÐÑÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ Ð ÐÐÐÐ"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "ÐÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÐÐÑÐ Ð VoIP"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐ"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "ÐÐÑÑÑÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "ÐÑÑÐÐ ÑÑÑÐÐÐ ÑÐ ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "ÐÑÑÐÐ ÑÑÑÐÐÐ ÐÐÑÐ Ñ ÐÐÐÑÑÐÐÑÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÑÐÐ, ÐÐÐ ÑÐ ÐÐÑÐÑÐÐÐ ÐÑÑÐÑÐÐÐ"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "ÐÑÑÐÐ ÑÑÑÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "ÐÐÐÐÑÐÐÐ ÐÐÑÐÑÐÐÐ ÑÐ ÐÑÐÐÐÐ"
 
@@ -548,169 +571,139 @@ msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐÐÐÐ %s"
 msgid "Call from %s"
 msgstr "ÐÐÐÐÐ ÐÐ %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "ÐÑÑÑÐ ÐÑÐÐÑÑÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÑÐÐÐÐÐ ÑÑÐÑÐ"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "ÐÐÑÑÑÐÐÐÐÐ ÑÑÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "ÐÑÑÐÐ ÑÑÑÐÐÐ ÑÐ ÐÑÐÐÐÐÑÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐ"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "ÐÑÑÐÐ ÑÑÑÐÐÐ ÐÐÑÐ Ñ ÐÐÐÑÑÐÐÑÑÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÑÐÐÑ"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "ÐÐÐÐÐÐÐÑ ÑÐÐÐÐÐ"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "ÐÐÑÑÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "ÐÐÑÐÐÑ"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "ÐÐÑÑÑÐÐ"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "ÐÐÐÐÐÑÐÐ"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "ÐÐÐÐÐÐÐÐÐ"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "ÐÐÑÐ ÐÐÐÐÐÐÐ ÑÐÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "ÐÑÐÑÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐ âÐÐÐÐÐÐÐÐÐâ"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "ÐÑÐÑÐÐ Ñ ÐÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÑÐÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÑÑ"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "ÐÐÐ ÑÐ Ñ ÑÐÐÑÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÑÐÐ"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐ ÐÑÑÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "ÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "ÐÑÐÑÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐ ÐÐ ÐÐÐÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐ ÑÐÐÐÐÐÑÐÐÑÐÐ"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "ÐÑÐÑÐÐ Ñ ÑÐÑÑÐÑÐÐÐÑÑ"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "ÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÑÐ ÑÑÐÐÑÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "ÐÐÐÑ ÑÐÑÑÑÑ ÑÐ ÐÐÑ ÐÐÐÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "ÐÐÐÑ ÐÐÐÐÐ ÑÐ ÐÐÑ ÐÐÐÐÐÐÐ ÑÐ ÑÐÑÐÐÑÐÐ"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐ ÐÐÑÐÑÑÐÑÐ ÐÑÑÐ ÑÐÑÑÑÑ"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "ÐÐÐÑ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐ ÑÐÑÐÐÑÑ"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "ÐÐÑÐÐÑ ÑÐ ÑÑÐÐÑÑÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐÐÑ ÐÐ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐÑ"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "ÐÐÑÑÐÑÐÐÐÑ ÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "ÐÐÑÑÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÐ ÑÐÑÑÐÐÐÑÐ ÐÐÐ ÑÐ ÐÑÐÐÑÐÐÑÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -718,24 +711,32 @@ msgstr ""
 "ÐÑÐÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑÐ, ÐÐÐ ÐÑÐÐÐÐ ÐÐÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÐÑÐÐÑÐ ÐÑÐÐÐÑÑÑÐ "
 "ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÑÐÐÐ ÐÐ ÑÐÑÑÐÐÐÑÐ"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "ÐÐÑ ÑÐÑÑÐÐÑ ÑÐ ÐÑÐÐÐÑÐ ÑÑÐÑ"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "ÐÐÑÑÑÐÑÑÐ ÐÑÐÑÐÐ"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "ÐÑÐÐ Ñ ÐÐÐÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "ÐÐÑÑ! ÐÐÐÐÐ"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "ÐÑÐÐ ÑÐÐÐÐÐÐÑ"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "ÐÐÑÑÐÑÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -744,7 +745,7 @@ msgstr[1] "ÐÑÐ %d ÑÐÐÑÐÐÐ"
 msgstr[2] "ÐÑÐ %d ÑÐÐÑÐÐÐ"
 msgstr[3] "ÐÑÐ ÑÐÐÐÐ ÑÐÐÑÐÐÐ"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -753,7 +754,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÑÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÑÑÐ"
 msgstr[3] "ÐÑÐ ÑÐÐÐÐÐ ÐÐÐÑÑÐ"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +763,7 @@ msgstr[1] "ÐÑÐ %d ÑÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÑÐÑÐ"
 msgstr[3] "ÐÑÐ ÑÐÐÐÐÐ ÑÐÑÐ"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -771,7 +772,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÐ"
 msgstr[3] "ÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐ"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -780,7 +781,7 @@ msgstr[1] "ÐÑÐ %d ÐÐÐÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÐÐÑÐ"
 msgstr[3] "ÐÑÐ ÑÐÐÐÐ ÐÐÐÐÑÐ"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -789,224 +790,196 @@ msgstr[1] "ÐÑÐ %d ÐÐÑÐÑÐ"
 msgstr[2] "ÐÑÐ %d ÐÐÑÐÑÐ"
 msgstr[3] "ÐÑÐ ÑÐÐÐÐÐ ÐÐÑÐÑÐ"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "Ñ ÐÑÐÑÑÐÐÑÑÐ"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "ÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "ÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "ÐÐÑÐÐÑ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "ÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "ÐÐÐÐÐ %s ÑÐ ÐÐÐÐÑÐÐ ÐÑÑÐÐ %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "ÐÐÐÐÐ %s ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "ÐÐÐÐÐÐ %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_ÐÑÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "ÐÑÐÑÐÐÐ _ÐÐ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "ÐÐÐÑ ÐÐÐÐÐ ÐÐÑ ÐÐÑÑÐÑÐ ÐÐ ÑÐÑÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "ÐÐ_ÐÐÑÑÐ"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s ÐÐ %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s ÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "ÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>ÐÑÐÐÐÑ:</b> ÐÐÑÐÐÐÐÐÐÐ"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_ÐÐÐÐÐÐÐ:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "ÐÐÐÑÐÐÐÐ"
+msgid "Screen _Name:"
+msgstr "_ÐÐÐÐÐÐÐ:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>ÐÑÐÐÐÑ:</b> ÐÐÑÐÐÐÐÐÐÐ"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_ÐÐÐÐÐÐÐ:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_ÐÐÑÑ:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_ÐÐÐÐÐÐÐ:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_ÐÐÑÐÐÑ:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐ?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "ÐÐÐÑÐÐÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_ÐÐÑÑ:"
+msgid "What is your AIM password?"
+msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÐ?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_ÐÐÑÐÐÑ:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>ÐÑÐÐÐÑ:</b> ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>ÐÑÐÐÐÑ:</b> ÐÐÑÐÑÐÐÑÐÐ_ÐÐÐ"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÑÐÑÐ ÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ÐÐÐÑ _ÐÐÐ:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>ÐÑÐÐÐÑ:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "ÐÐÐÐÐ Ñ_ÐÑÐÐÑÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ÐÐÐÑ _ÐÐÐ:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÐÑ ÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÑ ÐÐÐÐÐÐÐ?"
 
@@ -1043,11 +1016,23 @@ msgstr "ÐÐÑÐÑÐ"
 msgid "None"
 msgstr "ÐÐÑÑÐ"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "ÐÑÐÐÐ"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "ÐÑÐÐÐ:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "ÐÐÐÐÐ ÑÐÑÐÐÑÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "ÐÐÑÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1055,14 +1040,6 @@ msgstr ""
 "ÐÐÑÐÐÐ ÐÐÐ ÑÐÑÐÐÑÐ ÐÐ ÑÑÐÐÐ ÐÐÐÐÐÐÑ, ÐÐÑÐ ÐÐÐ ÐÐÑÑÐ ÑÐÐÑÑÐÐ, ÐÐÐÐÑÑÐ ÑÐ "
 "ÑÐÐÑÐÑÐ."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "ÐÑÐÐÐ"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "ÐÑÐÐÐ:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "ÐÐÐÐÐÐÐ:"
@@ -1079,48 +1056,20 @@ msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑ:"
 msgid "Real name:"
 msgstr "ÐÑÐÐÐ ÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "ÐÐÑÐÐÑÐ"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐ?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "ÐÐÑÐ ÐÐÐ ÐÑÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr "<b>ÐÑÐÐÐÑ:</b> korisnik gmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr "<b>ÐÑÐÐÐÑ:</b> korisnik jabber org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "ÐÐÑÑÐÐÐ ÑÐ _ÑÐÑÑÐÐÐÑÐ(TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_ÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÑÐÑÐÐÑÐ"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_ÐÑÐÐÑÐÑÐÑ:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÐ ÐÐÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_ÐÐÑÑÑÑ:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÑÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1132,179 +1081,203 @@ msgstr ""
 "ÐÐÐÐÐÐÐ ÐÐÐÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÑÐÑÐ, ÐÐÐÑÐ ÐÐ <a href=\"http://www.";
 "facebook.com/username/\">ÐÐÑ ÑÑÑÐÐÑ</a> ÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "ÐÐÑÐÑÑÐ ÑÑÐÑÐ ÐÐ_Ð"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÑÐÑÐ ÐÐÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÑÐÑÐ ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÑÐÐ ÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>ÐÑÐÐÐÑ:</b> korisnik gmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐ?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>ÐÑÐÐÐÑ:</b> korisnik jabber org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_ÐÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÐÐ ÑÐÑÑÐÑÐÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_ÐÑÐÐÑÐÑÐÑ:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_ÐÐÑÑÑÑ:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "ÐÐÑÑÐÐÐ ÑÐ _ÑÐÑÑÐÐÐÑÐ(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "ÐÐÑÐÑÑÐ ÑÑÐÑÐ ÐÐ_Ð"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÑÐÐÐÐ ÑÐÑÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÐÐÑ ÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑ ÐÐÐÐÐÐÐ?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÑ ÐÐÐÐÐÐÐ?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÐÐ ÐÐÐÐÑ ÐÐÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>ÐÑÐÐÐÑ:</b> korisnik hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐ ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live password?"
-msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "ÐÐÑÐÑÐ _Ð-ÐÐÑÑÐ:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_ÐÐÐÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_ÐÑÐÐÐÐÐ:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_ÐÐÐ:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "ÐÐÐ ÐÐ _ÐÐÑÐÐÑ:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_ÐÐÐÐÑ ÐÐ:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_ÐÑÐÐÐÐÐ:"
+msgid "E-_mail address:"
+msgstr "ÐÐÑÐÑÐ _Ð-ÐÐÑÑÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "ÐÐÐ ÐÐ _ÐÐÑÐÐÑ:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
 msgstr "<b>ÐÑÐÐÐÑ:</b> korisnik moj sip server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐÑ:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "ÐÑÐÑÐÑ ÐÐÐÐÐÐÐÐÑÐ"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐ ÑÐÑÐÐÑ"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "ÐÐÑÐÑÑÐ ÐÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ _ÐÐÐÐÑÑÐÐÑ Ð ÐÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÐ"
+msgid "NAT Traversal Options"
+msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐÑÐÐ ÐÑÐÐ ÐÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "ÐÐÑÐÐÐ (Ñ ÑÐÐÑÐÐÐÐÐ)"
+msgid "Proxy Options"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐ"
+msgid "Miscellaneous Options"
+msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "ÐÐÐÐÐ ÑÑÑÐÑÐÑÐ"
+msgid "STUN Server:"
+msgstr "ÐÐÐÐ ÑÐÑÐÐÑ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "ÐÐÑÐÐÐÐÐÐ:"
+msgid "Discover the STUN server automatically"
+msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÑÐÑÐÑ ÐÐÐÐ ÑÐÑÐÐÑ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "ÐÐÐÐÐ ÐÐÑÐÑÐ"
+msgid "Discover Binding"
+msgstr "ÐÑÐÑÐÑ ÐÐÐÐÐÐÐÐÑÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "ÐÐÑÐÑÐ ÐÑÐÐÐÑÐÐ ÐÑÐÐ ÐÐÐ"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "ÐÐÑÐÐÑ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÑÐÐÐÐÑÐ ÑÑÐÐÐÐ ÐÐÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "ÐÐÑÑ:"
+msgid "Mechanism:"
+msgstr "ÐÐÑÐÐÐÐÐÐ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "ÐÐÑÐÑÐ ÐÐÑÑÐÐÐÐÐÐ"
+msgid "Interval (seconds)"
+msgstr "ÐÐÑÐÐÐ (Ñ ÑÐÐÑÐÐÐÐÐ)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ ÐÐ ÐÑÐÑÐÐÑ:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "ÐÑÐÐÑÐÐÑÑ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "ÐÐÐÐ ÑÐÑÐÐÑ:"
+msgid "Loose Routing"
+msgstr "ÐÐÐÐÐ ÑÑÑÐÑÐÑÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "ÐÐÑÐÐÑ:"
+msgid "Ignore TLS Errors"
+msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐ ÐÑÐÑÐÐ"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "ÐÑÐÐÑÐÐÑÑ:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "ÐÐÑÐÑÑÐ ÐÐÐÑ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐ _ÐÐÐÐÑÑÐÐÑ Ð ÐÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÐ"
+msgid "Port:"
+msgstr "ÐÐÑÑ:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "ÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐÐ ÐÐÐÐÐ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐ ÐÑÐÑÐÐÑ?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_ÐÐÑÐÑÐÐÑÐÐ ÐÐÐ:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "ÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐ ÐÐ ÐÐÑ ÐÐÐ ÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "ÐÐÑÑ! Ð_Ð:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐÐÐÑÐ Ð ÐÐÐÑÐÑÐÐÑÐÑÐ"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "ÐÐÐ_ÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐ:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑ ÐÐÑÑ! ÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÑ! ÐÐÐÐÐÐÐ?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "ÐÐÑÑ! Ð_Ð:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "ÐÐÐ_ÐÐÐÐ ÑÐÐÑÐÐ ÑÐÐÐ:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1343,7 +1316,7 @@ msgid "Click to enlarge"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑÐÑÐ"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÐÐÑÐ"
 
@@ -1363,63 +1336,67 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÑÐÑÐÐÐÐ"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "ÐÐÐÑ ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÑÐÑÐÐ ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÐÑ ÐÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐ ÐÑÐÐÐÑÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "ÐÐÐÐ ÐÐÑÑ ÐÐÐÑÐÐÐÐ Ñ ÐÐÐÐ ÑÐÐÐÐÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÑÐÐÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
 msgid "â%sâ is not a valid contact ID"
 msgstr "â%sâ ÐÐÑÐ ÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: ÑÐÑÑÐ ÑÐÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <ÑÐÐÐ>: ÐÐÑÑÐÐÑÐ ÑÐÐÑ ÑÑÐÐÑÑÐÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <ÐÐ ÑÐÐÐ>: ÐÑÐÐÑÑÑÑÑÐ ÑÐ ÐÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <ÐÐ ÑÐÐÐ>: ÐÑÐÐÑÑÑÑÑÐ ÑÐ ÐÐÐÐÑ ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<ÐÐ ÑÐÐÐ>] [<ÑÐÐÐÐÐ>]: ÐÐÐÑÑÑÐ ÑÐÐÑ ÐÐ ÑÐÑÐÐÑÐ, ÐÐÐÑÐÐÑÐÐÐÐÐÐ ÑÑÐÐÑÑÐÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <ÐÐ ÐÑÐÑÐÑÐÑÐ> [<ÐÐÑÑÐÐ>]: ÐÑÐÐÑÐ ÐÑÐÐÐÑÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <ÐÐ ÐÑÐÑÐÑÐÑÐ> <ÐÐÑÑÐÐ>: ÐÑÐÐÑÐ ÐÑÐÐÐÑÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <ÐÐÐÐÐÐÐ>: ÐÐÑÐ ÐÐÑ ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐÐ ÑÐÑÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <ÐÐÑÑÐÐ>: ÑÐÑÐ ÐÐÑÑÐÑ ÐÐÐÐÐ ÐÐ ÑÑÐÐÑÑÐÐ ÑÐÐÐÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1429,11 +1406,11 @@ msgstr ""
 "ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÑÑ ÑÐ â/â. ÐÐ ÐÑÐÐÐÑ: â/say /join ÑÐ ÐÐÑÐÑÑÐ ÐÐ ÐÑÐÐÑÑÑÐÐÐÑÐ "
 "Ñ ÐÐÐÑ ÑÐÐÑ ÐÐ ÑÐÑÐÐÑÐâ"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <ÐÐ ÐÐÐÑÐÐÑÐ>: ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÑÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1418,128 @@ msgstr ""
 "/help [<ÐÐÐÐÐÐÐ>]: ÐÑÐÐÐÐÑÑÐ ÑÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÐ. ÐÐÐ ÑÐ ÐÐ Ð ÐÐÐÐÑÐÑÐÐ "
 "<ÐÐÑÐÐÐÐ>, ÐÑÐÐÐÐÑÑÐ ÑÐÐÐ ÑÐÑÑÑÑÐÐ ÐÐ ÑÐÐÑÑÐÐÑ."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "ÐÐÑÐÑÑÐÑÐ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÑÐÐÐÐ; ÐÐÐÐÐÐÐÑÑÐ /help ÐÐ ÐÐÑÑÑÐÐÐ ÐÐÑÐÐÐÐ"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1541
 msgid "insufficient balance to send message"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐÑÑÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ â%sâ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÑÐÐÐÐÐ ÐÐ ÑÐÐÑÐ ÐÐÑÑÐÐ. <a href='%s'>ÐÐÐÑÐÐÑÐ</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr "ÐÐÑÐÐÑÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "ÐÐÐÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑ"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "ÐÑÐÑÑÑÐ ÑÐ ÐÐÐÑÐÑÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÑÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ â%sâ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÑÐÐ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "ÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "ÐÐÐÐ ÑÐ ÐÐÑÑÐÐÑÐÐÐ ÐÐ: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "ÐÐÐÑ ÑÐ ÐÐÑÑÐÐÐÐ %s ÐÐ: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "ÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(ÐÐÐÐ ÐÑÐÐÐÐÐÐ)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2289
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "ÐÐÐÐÑ â%sâ Ñ ÑÐÑÐÐÐ"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "ÐÐÐÐÑ â%sâ Ñ ÑÐÑÐÐÐ ÐÐ %s ÑÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "ÐÐÐÑÐ ÑÐÐÑÐÐ"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_ÐÐÑÐÑÐ"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "ÐÑÐÐÐÐÐÐ ÐÑÐÐÐÐÐ_ÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÑÐÑÐÐÐÐ ÑÐÐÑÐÑÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s ÑÐ ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ"
@@ -1555,12 +1547,12 @@ msgstr "%s ÑÐ ÐÑÐÑÐÐ ÑÐ ÐÐÐÐ"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s ÑÐ ÐÐÐÐÑÐÐ ÐÐÑÐÑÐÐÐÐ %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
 msgstr "%s ÑÐ ÐÐÐÐÑÐÐ"
@@ -1568,17 +1560,17 @@ msgstr "%s ÑÐ ÐÐÐÐÑÐÐ"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s ÑÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÑÑÐ ÐÐÑÐÑÐÐÐÑ %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
 msgstr "ÐÐÑÐÑÐÐÐÑ %s ÑÐ ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
 msgstr "%s ÑÐ ÐÐÐÑÑÑÐÐ(ÐÐ) ÐÑÐÑÐÐÐÐÑÑ"
@@ -1588,17 +1580,17 @@ msgstr "%s ÑÐ ÐÐÐÑÑÑÐÐ(ÐÐ) ÐÑÐÑÐÐÐÐÑÑ"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s ÑÐ ÐÑÐÑÑÑÐÐÐ(ÐÐ) ÐÑÐÑÐÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ÑÐ ÑÐÐÐ ÐÐÐÐÐÑ ÐÐÐ %s"
@@ -1606,90 +1598,90 @@ msgstr "%s ÑÐ ÑÐÐÐ ÐÐÐÐÐÑ ÐÐÐ %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
 msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐÑ ÐÐÐÐÐÐÑ?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
 msgstr "ÐÐÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
 msgstr "ÐÐ ÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "ÐÐÐÑÑÐÑ ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐ, ÐÐÐÑÑÐÑÑÐ ÐÐÐÐÐÐ:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
 msgstr "ÐÐÐ ÑÐÐÐ ÑÐ ÐÐÑÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
 msgstr "ÐÑÐÐÑÑÑÐ ÑÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "ÐÐÐÐÐÐÐÑ"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4107
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (ÐÐÐ)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÑÐÐÐÑÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ ÑÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÑÑÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÑÑÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "ÐÑÐÑÑÑÐ ÑÐ ÐÐÐÑÐÑÐÐ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "ÐÐÐÐÐ:"
 
@@ -1697,468 +1689,385 @@ msgstr "ÐÐÐÐÐ:"
 msgid "Blocked Contacts"
 msgstr "ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "ÐÐÐÐÐÐ"
-
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "_ÐÐÐÐÐÐ ÐÐÑÐÑÑ ÐÐÐÐ"
-
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_ÐÑÐÐÑÐ ÐÐÐÑ"
-
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
-msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "ÐÐÐÐÑÐ Ð ÐÑÐÑÐÐÑ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
-msgid "New Contact"
-msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐÑ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
-#, c-format
-msgid "Block %s?"
-msgstr "ÐÐÐÐÐÑÐÑÐ %s?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
-"ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑ â%sâ ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÐÑÐ?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
-msgid "_Block"
-msgstr "_ÐÐÐÐÐÑÐÑ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "Ð_ÑÐÑÐÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
-msgstr[1] "Ð_ÑÐÑÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
-msgstr[2] "Ð_ÑÐÑÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
-msgstr[3] "Ð_ÑÐÑÐÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "ÐÐ_ÐÑÑÐ ÐÐÑÐÐÑÐ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÐÐÑÑ"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
-msgstr "_ÐÐÐÐÐÑÐÑ ÐÐÑÐÑÐÐÐÐ"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "ÐÐÐÑÑÐÐÑÐÐÐ"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "ÐÐÐÑÐÐÐ ÑÑÐÐ"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÑÑÐÑ â%sâ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "ÐÐÐÐÑÐÐ ÐÑÑÐÑ"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_ÐÐÐÐÐÐ"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÑÐÑÐÑÐÑÐ â%sâ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "ÐÐÐ_ÐÑ ÐÑÐÑÐÑÐÑÐâ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_ÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐÑ"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "ÐÐ_ÑÐÐÑÐ"
+#. 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 "_ÐÐÐÐÐÐ ÐÐÑÐÑÑ ÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_ÐÑÐÐÐ ÐÐÐÐÐ"
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Open Link"
+msgstr "_ÐÑÐÐÑÐ ÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-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-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐÐÑÐ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-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-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "ÐÐÐÐÐÐ ÐÐÑÑ ÑÐÐÐÑ ÐÐÐÑÑ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÑ â%sâ ÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÐÑÐ?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "ÐÐÐÑÐÐÐ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_ÐÐÐÐÐÑÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-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] "Ð_ÑÐÑÐÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
+msgstr[1] "Ð_ÑÐÑÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
+msgstr[2] "Ð_ÑÐÑÐÐÐ ÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
+msgstr[3] "Ð_ÑÐÑÐÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÑÑÐÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "ÐÐÐ_ÐÐÐ"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÐÑÐÑÐÐÐÑÑ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÑ Ñ ÐÐÑ ÑÐÐÑ"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "_ÐÐÐÐÐÑÐÑ ÐÐÑÐÑÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "ÐÐÐÐÐ_Ð Ñ ÑÐÐÑ ÐÐ ÑÐÑÐÐÑÐ"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "ÐÐ_ÐÑÑÐ ÐÐÑÐÐÑÐ"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "ÐÑÐÑÑÐÐÐ ÐÐÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "ÐÑÐÑÑÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "ÐÐÐ_ÐÑ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "ÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "ÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑ ÐÑÐÐÑÑÐÐÑÐ:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "ÐÐÐÐÐ ÐÐÑ ÐÐÐÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐ ÑÑÐ ÐÐ ÐÑÐÐÐ. ÐÐÐÐÐ!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "ÐÑÐÐ ÐÐÐ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "ÐÑÐÑ ÑÐÐÐÑÐÐÐ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "ÐÐÑÐÑÐ Ð-ÐÐÑÑÐ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "ÐÐÑÐÐÐÐÐ:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "ÐÐÑÐÐ ÐÑÐ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "ÐÐÐÐÐÐÐ ÑÐ:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "ÐÐÑÑÐÐ ÐÐ ÐÐÑÑÑÐÐÑÑ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "ÐÐÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ÐÐÐ ÐÐÐ ÐÑÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "ÐÑÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "ÐÐÐÑÐÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "ÐÑÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "ÐÐÐÐÑÑ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "ÐÐÑÑÐÐÑÐÐ ÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "ÐÐÐÑÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "ÐÐÑÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "ÐÐÑÐÑ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "ÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "ÐÐÐÑÑ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "ÐÐÐÑ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "ÐÐÑÐÑÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "ÐÐÐÐ ÑÐÑÐÐÑÑÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "ÐÑÐÑÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐ (Ñ ÐÐÑÑÐÐÐ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "ÐÐÐÐÑÐÐÐÐ ÐÑÐÑÐÐ (Ñ ÐÐÑÑÐÐÐ):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "ÐÑÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "ÐÑÐÐÐÑ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "ÐÑÐÐÐÐ ÐÐÑÐÑÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "ÐÐÑÐÐÐÑÐ ÐÑÑ ÐÐÑÑÐÑÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÐÑÐÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "ÐÐÐÐÑÐÑÑÐÐ ÑÐÑÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "ÐÐÑÐÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "ÐÐÐÐÑÐÑÐ"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y Ñ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "ÐÐÑÑÐÐÑ ÑÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>ÐÐÐÐÑÐÑÐ</b> Ñ (ÐÐÑÑÐ)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "ÐÐÐÐÐÐÐ:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÑÑ"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "ÐÑÐÐÑÐÐ:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "ÐÐÑÐÐ ÐÐÐÐÑÐ"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "ÐÐÑÐÑÐ Ð ÐÑÐÑÐÑÐÑÑ"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "ÐÐÐ Ð ÐÑÐÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "ÐÑÐÑ ÑÐÐÐÑÐÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "ÐÐÑÐÑÐ ÐÐ. ÐÐÑÑÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "ÐÐÐ ÑÑÑÐÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "ÐÐÑÐÐÐÐÐ"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "ÐÐÑÐÐ ÐÑÐ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "ÐÐÐÐÐÐÐ ÑÐ:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "ÐÐÑÑÐÐ ÐÐ ÐÐÑÑÑÐÐÑÑ:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Work"
+msgid "work"
+msgstr "ÐÐÑÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "ÐÑÑÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Mobile"
+msgid "mobile"
+msgstr "ÐÐÐÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "ÐÐÐÑÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "ÐÑÐÐÐÑÑÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "ÐÐÑÑÐÐÑÐÐ"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "ÐÐÑÐÑÐÐ"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "ÐÐÐÐÑÐÑÐÐÐÑÐÑ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "ÐÐÐÐÐÐÐ:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ÐÐÐÐÑÐÑÐ</b> Ñ (ÐÐÑÑÐ)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requestedâ"
 msgstr "ÐÐÑÑÐÐÐÐÐ ÑÑ ÐÐÐÐÑÐâ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "ÐÐÐÐÑÐ Ð ÐÐÐÑÐÐÑÑ"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "ÐÐ:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "ÐÐÐÐÑÐ:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "ÐÑÐÐÑÐÐ:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "ÐÑÑÐÐ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +2075,21 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑÐ ÐÑÑÐÐ Ñ ÐÐÑÐÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐ ÐÑÐÑÐÑÐÑ ÐÐÐÐÐÐ.  ÐÑÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐ "
 "ÐÐ ÐÐÐÐÐÑÐÑÐ Ð ÐÐÑÐ ÐÑÑÐÐ ÐÐÐ Ð ÐÐÑÐÐÐÑ."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "ÐÐÐ_ÐÑ ÐÑÑÐÑ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "ÐÐÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "ÐÑÑÐÐ"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑ ÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ:"
@@ -2188,7 +2097,7 @@ msgstr[1] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ:
 msgstr[2] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ:"
 msgstr[3] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑ ÑÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ:"
@@ -2196,79 +2105,145 @@ msgstr[1] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÐÐ
 msgstr[2] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ:"
 msgstr[3] "ÐÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐÐÐÐÑÐÐ:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑ ÐÐÐÐ ÑÐ ÐÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "ÐÐÐÐÐÐ ÐÐÐÐÑÐÐ ÐÐÐÑÐÐÑÐ"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÑÐ ÐÐÑÐ ÐÐÑÐÑÑÐÐ ÐÐ ÐÐÐÐÐ"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "ÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "ÐÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "ÐÐÑÐÐ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "ÐÐÐÐ"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_ÐÐÐÐÐÑÐÑ ÐÐÐÑÐÐÑ"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "ÐÐ_ÑÐÐÑÐ"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_ÐÐÐ"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_ÐÑÐÐÐ ÐÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_ÐÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_ÐÑÐÑÑÐÐÐÐ ÑÐÐÐÐÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "ÐÐÐÐÐÐ ÐÐÑÑ ÑÐÐÐÑ ÐÐÐÑÑ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "ÐÐÐÑÐÐÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "ÐÑÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "ÐÐÑÑÐÐÐÑÐÑÑÐ âgnome-contactsâ ÐÐ ÐÑÐÑÑÑÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÐÑÐ."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "_ÐÐÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_ÐÑÐÐÐ"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contactsâ"
-msgstr "_ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÑ Ñ ÐÐÑ ÑÐÐÑ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "ÐÐÐÐÐ_Ð Ñ ÑÐÐÑ ÐÐ ÑÐÑÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contactâ"
+msgstr "ÐÐÐ_ÐÑ ÐÑÐÑÐÑÐÑÐâ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
+msgid "Delete and _Block"
+msgstr "ÐÐÐÑÐÑÐ Ð _ÐÐÐÐÐÑÐÑ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÑÑÐÑ â%sâ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "ÐÐÐÐÑÐÐ ÐÑÑÐÑ"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
-msgid "Delete and _Block"
-msgstr "ÐÐÐÑÐÑÐ Ð _ÐÐÐÐÐÑÐÑ"
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÐÑÐÑÐÑÐÑÐ â%sâ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2277,7 +2252,11 @@ msgstr ""
 "ÐÐ ÐÐ ÑÑÐÐÑÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑ â%sâ? ÐÐÐ ÑÐ ÑÐÐÐÐÐÑÐ Ð ÑÐÐ "
 "ÐÐÐÑÐÐÑÐ ÐÐÑÐ ÑÑ ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÑÐÐÑ."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "ÐÐÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2290,23 +2269,23 @@ msgstr[3] "ÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑ ÑÐÐÑÐÐ ÑÐÐÐÐ ÐÐÐÑÐÐ
 msgid "<b>Location</b> at (date)"
 msgstr "<b>ÐÐÐÐÑÐÑÐ</b> Ñ (ÐÐÑÑÐ)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "ÐÐ ÐÐÐÐ ÐÑÐÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÐ ÑÑÐÑÐÑÐ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "ÐÐÐÐ ÐÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐ ÐÑÐÐÑ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "ÐÐÑÐÑÑÑ _ÐÑÐÐÐÐ ÑÐÐÑÐÐ"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "ÐÐÐÐÐÑÐ"
@@ -2319,91 +2298,48 @@ msgstr "ÐÐÐÐ ÑÐÑÐÐÑ"
 msgid "SSL"
 msgstr "ÐÐÐ"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Linkâ"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlinkâ"
-msgstr "_ÐÐÐÐÐÐÐâ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_ÐÐÐÐÐ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "ÐÐ ÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ â%sâ?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ? ÐÐÐÐ ÑÐÑÐ "
-"ÑÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_ÐÐÐÐÐÐÐ"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "ÐÑÑÐÑÐÑÐÑ"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "ÐÐÑÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "ÐÐÑÐÐÑÐ Ñ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "ÐÐÑÐÐÑÐ ÑÐ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2412,7 +2348,7 @@ msgstr[1] "%s ÑÐÐÑÐÐÐ"
 msgstr[2] "%s ÑÐÐÑÐÐÐ"
 msgstr[3] "ÑÐÐÐÐ ÑÐÐÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2421,151 +2357,209 @@ msgstr[1] "%s ÐÐÐÑÑÐ"
 msgstr[2] "%s ÐÐÐÑÑÐ"
 msgstr[3] "ÑÐÐÐÐÐ ÐÐÐÑÑÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "ÐÐÐÐÐ ÑÐ ÐÐÐÐÑÐÑ %s, Ð ÐÐÐÑÑÐÐ ÑÐ %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "ÐÐÐÐÑ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "ÐÑÑÐ"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "ÐÐÐÐ ÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "ÐÐÐÐ ÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "ÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "ÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "ÐÐÐÐ ÑÑÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "ÐÑÐÐÑÑÑÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "ÐÑÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÐÑÐ ÑÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐÑ ÑÐÐÐÐÐÐÑÐ?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "ÐÑÐÑÑÐ ÑÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "ÐÐÑÐÑÐ ÐÐ:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">ÐÑÐÑÐÐÐÐ...</span>"
+msgid "_File"
+msgstr "_ÐÐÑÐÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "ÐÐÑÐÐÑÐ"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "ÐÐÐ_ÐÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "ÐÐÑÐÑÐ ÑÐÐ ÐÑÑÐÑÐÑÐÑ..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "ÐÑÐÑÐÐ"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "ÐÐÐÐÐ"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "ÐÐÑÐÐÑÐ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "ÐÐÐ_ÐÐÐ"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "ÐÐÐÐÐ"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_ÐÐÑÐÑÐÐÐ"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "ÑÑÑÐÐÐ 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "ÐÐ ÐÑÐÑÐÑÐÑÐ:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">ÐÑÐÑÐÐÐÐ...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ð_ÐÑÐÐÑ"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "ÐÐÐÑÐÐÑ ÐÐÑÐ ÐÐ ÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÑ ÐÐÐ ÑÐ ÐÐÐÑÐÑÐÐÐÐ ÐÐÐ ÐÐÐÐÐÐÐÑ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr "ÐÐÐÑÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÐÑÑÑÑ ÑÐÐÐÐÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "ÐÐÑÑÐÐÐÐÐ ÑÑÐÐÑÐÐÐÐÐÐÐÑÑ ÐÐÑÐ ÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐÐÑ ÐÑÐÑÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÐÑÐÐÐ ÑÐÐÐÐÐÐÑ ÑÐ ÐÐÑÐÐ ÐÐÐÑÐÐÑÐÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "ÐÐÐÐÑÐÐÐ ÑÑÐ ÑÐ ÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "ÐÐÐÑ ÐÐÐÐÐ ÑÐ ÐÑÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÑÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐÑ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÐÐÐÐ ÐÐÐ ÑÐ ÐÐÐÐ ÐÑÐÐÐÐÑÑÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐÑÑÑÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐÑÐ ÑÐÐÐÐÐÐÑÐ"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐÐÐÐ ÐÐÐÑÐÐÑÐ ÐÐÐ ÑÐÐÐÑÐÐÑÐÐ ÐÑÐÑ:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐÐÑ"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "ÐÐÑÐÑÐ _ÐÐÐÐÐ"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "_ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_ÐÐÐÐÐÐ"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "_ÐÑÐÐÐ ÐÐÐÐÐ"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "ÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "ÐÐÑÐ ÑÑÐÐÐÐ ÐÐÑÐÑÑÐÐÐÑÐ ÐÐÐÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐ <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2602,12 +2596,8 @@ msgstr "ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ ÐÐÑ ÐÐÑÑÐÑ ÑÑÐÑÐ
 msgid "Set status"
 msgstr "ÐÐÑÑÐÐÐ ÑÑÐÑÐ"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ Ð ÑÑÐÐÑÑÐÐ ÑÑÐÑÐ"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messagesâ"
 msgstr "ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐâ"
 
@@ -2625,20 +2615,20 @@ msgid "Find:"
 msgstr "ÐÑÐÐÐ:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
+msgid "_Previous"
+msgstr "_ÐÑÐÑÑÐÐÐÐ"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "ÐÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_ÐÐÐÐÐÑÐ"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_ÐÑÐÑÑÐÐÐÐ"
+msgid "Phrase not found"
+msgstr "ÐÐÑÐÐ ÐÐÑÐ ÐÑÐÐÐÑÐÐ"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,12 +2674,12 @@ msgstr "ÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑ ÑÐ ÐÐÐÑÑÐÐ"
 msgid "Edit Custom Messages"
 msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÑÑÐÑÐÐÐ %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "ÐÐÑÐÐÐÐÐ"
 
@@ -2770,30 +2760,34 @@ msgid "Continue"
 msgstr "ÐÐÑÑÐÐÐ"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "ÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÐ"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "ÐÐÐ ÐÐÐÐ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ. ÐÐÐÐÑÐ ÐÐ ÐÐÐÐ ÐÐ ÐÐÑÑÐÐÐÑÐ?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÑ ÐÐÐÐÑ ÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐ"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "ÐÐÑÐÑÐ ÑÐÑÑÐÑÐÐÐÑÐ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÑÐÐÑÐÐ ÐÐÑÐÑÑ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "ÐÐÐÐ ÐÐÐÐÑÐÐ ÑÐÐÐÐÐÐÐÐ ÐÐÑÑÐ ÐÐ ÑÑÐÐÑÐ ÐÐÑÐÑÐÐÐ"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,7 +2796,7 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÑÐ %s ÐÐ ÑÐÐÐÐÑÐ ÐÐÐ ÐÐÑÐÑÐÐÐ, ÐÐÐ ÑÐ ÐÐÑÑÑÐÐÐ ÑÐÐÐ %s. ÐÐÐÐÐÑÐÑÐ "
 "ÐÑÑÐÐ ÐÐÑÑÐ ÐÐ ÑÐÐÐÐÑÐ."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "ÐÐÐÐÐÐÑÐ ÐÐÑÐÑÐÐÐ ÐÐ %s"
@@ -2974,40 +2968,32 @@ msgstr "ÐÐÐÐÐÐÐ"
 msgid "Vietnamese"
 msgstr "ÐÐÑÐÑÐÐÐÑÐÐ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÑÐÐÐ."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÐÐÐ."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "ÐÐÐÐ ÐÐÑÑÐÐ Ð ÐÑÐÑÐÐÐÐ"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "ÐÑÐÐ ÐÐÑÑÐÐ (ÐÐÑÐÐÐÐÑÐ)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "ÐÐ ÐÐÐÐÐÑÑ ÑÐ ÐÐ ÐÐÐÑÐÑÐÑÑ"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "ÐÐ ÐÑÐÐÐÐÑÑ ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ ÐÐÑÐ ÐÐÐÐ ÐÐÑÐ ÐÑÑÐÐ ÐÑÐÐÐÑÑÐ ÐÐ ÐÐÐÑÐÑÐÑÑ"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "â ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÑÐÑÐ ÑÐ ÐÐÑÐÐÐÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3055,11 +3041,11 @@ msgstr ""
 "ÐÐÑÐÑÑ: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "ÐÐÐÐÐÐ ÐÑÐÐÑÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "ÐÐÐÐÐÐ ÐÐÐÐÐ <dsegan gmx net>\n"
@@ -3101,35 +3087,36 @@ msgstr ""
 "ÐÐÑÐÐÑÐÑÐ ÐÐÐÐÑÐÐÐÐ Ð ÐÐÐÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ âÐÐÐÐÐÐâ."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "ÐÐÑÐ ÑÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐÐÑÐ?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ÐÐ ÐÐ ÐÐÐÑÐ ÑÐÑ ÐÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "ÐÐÑÐ ÑÐÐ ÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "ÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÐÐÑÐ ÑÐÑ ÐÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3141,42 +3128,42 @@ msgstr ""
 "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ. ÐÐ ÐÐÐÑÐÑÐÐÐÐ Ð ÐÐÐÐÑÐÐ ÑÐÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ Ð "
 "ÐÑÐÐÐ Ð ÐÐÐÐÐ ÐÐÐÐÐÐ."
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
 "ÐÐ ÐÐ ÐÐÐÑÐ ÐÐÐÐÐ ÐÐÑÐ ÑÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐ ÐÐÐÐÐ ÐÑÑÐÐÐ ÐÑÐÐÑÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "ÐÐ, ÑÐÐÐÐ ÐÐÑÐÑÐ ÐÐÐ ÐÐÐÐÐÐ ÐÐ "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "ÐÐ, ÑÐ ÑÑ ÑÐÐ ÑÐÐÑÐ ÐÐÑÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "ÐÐ, ÐÐÐÐÐ ÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "ÐÐ, ÐÐ ÑÐÐÐ ÑÐÐÐ ÐÐÐÐÐ ÐÐ ÐÐÐÐÐ ÑÑÐÐ Ñ ÐÐÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐ ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "ÐÐ"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "ÐÐ, ÑÐ ÑÐ ÑÐÐ ÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3188,16 +3175,16 @@ msgstr ""
 "ÑÑ ÐÐÑÐÑÐ ÐÑÐÐÐ ÑÐÑÐÐ. ÐÐÐÐ ÐÑ ÐÐÐÐÑÐ ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑÐ ÐÐÐ ÐÑÐÑÑÑÐÑÐ ÐÐÑ "
 "ÐÐÐÑÑÐÐÑÑ ÐÐ ÐÑÐÐÐÑÑÐÑÐ âÐÐÐÐÐÐâ."
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "ÐÐÐÐÐÐ->ÐÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "ÐÐ ÑÐÐÐ _ÐÐ ÐÐÐÐÐ ÐÐ ÐÐÑÐÑÑÐÐ ÐÐÑ ÐÐÐÑÑÐÐÑÑ"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1148
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3208,85 +3195,94 @@ msgstr ""
 "salut ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ. ÐÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÑÐÑÐ ÐÐÐ, ÐÐÑÑÐÐÐÑÐÑÑÐ ÐÐÐÐÑ "
 "telepathy-salut Ð ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ âÐÑÐÐ Ñ ÐÐÐÐÐÐÐâ ÐÐ ÐÑÐÐÐÑÑÐÑÐ âÐÐÐÐÐÐâ."
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "ÐÑÐÑÑÐÐÑ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐ ÐÐÑÑÐÐ Ð ÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "ÐÐÐÑÐÐÐÑÐÐ Ñ ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÑ"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÑÐ ÐÐÑÑÐÑÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐ"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "ÐÐÑÑÐÑÐ ÐÐÑÐÑÑÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐÐÐÐÑ %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "ÐÐÑ ÐÐÐÐ ÐÐÐÐÐ ÑÐÑ ÐÐÑÐ ÑÐÑÑÐÐÐ."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connectingâ"
 msgstr "ÐÐÐÐÐÑÑÐÐ ÑÐâ"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline â %s"
 msgstr "ÐÐÐÐÐÐÐÐÐ â %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected â %s"
 msgstr "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ â %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline â No Network Connection"
 msgstr "ÐÐÐÐÐÐÐÐÐ â ÐÐÐÐ ÐÑÐÐÐÐ ÐÐÐÐÐÑÐÑÐ"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÑÑÐÑÐ"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline â Account Disabled"
 msgstr "ÐÐÐÐÐÐÐÐÐ â ÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÑÑÐÐ"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"ÐÐÐÐ ÑÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐ, ÐÐÐÐÐÐÑÐÐÑÐ ÑÐÐÑÐ ÐÐÐÐÐÐ.\n"
-"ÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ?"
+#: ../src/empathy-accounts-dialog.c:530
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ"
+
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "ÐÐÑÐÐ ÑÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐ ÐÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐ ÑÐ ÑÐÑÐÐÑÐ."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "ÐÑÐÐÑÑÐÐÐÑÐ ÐÐÐÑ ÐÐ ÑÑÐÐÐÑÐ ÐÐÑÐ ÐÐÑÐÐ ÐÐÐÐÑÐÐ."
+
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_ÐÑÐÐÐ ÐÐÑÐÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑÐ..."
+
+#: ../src/empathy-accounts-dialog.c:1289
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÑÐ â%sâ ÑÐ ÐÐÑÐÐ ÑÐÑÑÐÐÑÐ?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "ÐÐÐ ÐÐÑÐ ÑÐÐÐÐÐÑÐ ÐÐÑ ÐÐÐÐÐ ÐÐ ÑÐÑÐÐÑÑ."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1529
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3291,15 @@ msgstr ""
 "ÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "_ÐÐÐÐÑÑÐ"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "Ð_ÐÐÐÐÐÑÑÐ"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2176
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3311,15 @@ msgstr ""
 msgid "Addâ"
 msgstr "ÐÐÐÐÑâ"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÑ"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ"
+msgid "_Importâ"
+msgstr "_ÐÐÐÐÐâ"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "ÐÑÐÑÐÐÐÐ:"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,15 +3327,19 @@ msgstr ""
 "ÐÐ ÐÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐ, ÐÑÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÑÐ ÐÑÐÐÑÑÑÐÐ ÐÐ ÑÐÐ ÐÑÐÑÐÐÐÐÐ "
 "ÐÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÐÑÑÐÑÐ."
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "ÐÐÑÐÐÐÐ ÐÑÐÑÐÐÐÐ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Importâ"
-msgstr "_ÐÐÐÐÐâ"
+msgid "Loading account information"
+msgstr "ÐÑÐÑÐÐÐÐ ÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÑ"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " â ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑ ÐÑÐÑÐÐÐ"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑ ÐÑÐÑÐÐÐ"
 
@@ -3351,132 +3347,121 @@ msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ ÐÐÐÑÐÐÑ ÐÑÐÑÐÐÐ"
 msgid "People nearby"
 msgstr "ÐÑÐÐ Ñ ÐÐÐÐÐÐÐ"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
 msgstr "â ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐ/ÐÐÐÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
 msgstr "ÐÐÑÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐ/ÐÐÐÐÐ ÐÐÐÑÐÐÑ"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "ÐÐÐÑÑÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "ÐÑÐÐÑÑÐÐÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "ÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_ÐÐÑÐÐ ÐÐÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "ÐÐÑÑÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "ÐÐÐÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "ÐÑÐÑÑÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "ÐÐÑÐÑÐ"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "ÐÐÐÐÐ ÑÐ ÐÐÑÐÑÐÐÐÐÐ %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "ÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÑÐ ÐÐÐÐ ÐÐÐÑ ÑÐÑÑÐÐÑ"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "ÐÐ ÐÐÑÐÑÐ ÐÐÐÐ ÑÐ ÐÐÐÐ ÑÐÑÐÐÑ ÐÐ ÐÐÑÐÑÐÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "ÐÐ ÐÐÑÐÑÐ ÐÑÑÑÐÐÐ ÐÐÐÐ ÑÐ ÐÐÐÐ ÐÑÑÐÐ ÑÑÑÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "ÐÐ ÐÐÑÐÑÐ ÑÐÐÐÑÐÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "ÐÐ ÐÐÑÐÑÐ ÐÑÑÐÐ ÐÐ ÐÐÑÐÑÑÑÑÐÐ ÐÐÐÑÐÐÐÑÐ"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "ÐÐÐÐÐÐÐÑÐ"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "ÐÐÐÐÐÐÐÑÐ"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "ÐÐÐÐÐÐÐÑÐ"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+#| msgid "Unknown"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "ÐÐÐÐÐÐÐ â %d:%02dÐ"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "ÐÐÑÐÐÑÐÐ ÐÐÑÐÑÐ"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "ÐÑÐÐÑÐÐ %s ÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÑÑÐÐ ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÑÐÑÑÐÐÑ"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "ÐÑÐÐÑÐÐ %s ÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐÐ ÐÐÐÐÐ ÑÐÑÐÐÑ ÐÐÑÐ ÐÐÐÑÐÐÐÐ ÐÐÑ ÑÐÑÑÐÐÑ"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3470,27 @@ msgstr ""
 "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐÑ ÑÐ %s. ÐÐÐÐÐ ÑÐ ÐÐÐÐ ÐÐ ÐÐÑ ÐÐÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐ "
 "ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÐ."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÑÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "ÐÐÑÑÐÐ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ ÐÐÑÑ ÐÐÑÑÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ ÑÐÑÑÐÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "ÐÐÐÐÐ ÑÐÑÐÐÑÐ ÐÐÑÑÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ ÐÐÑÑ ÐÐÑÑÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ ÑÐÑÑÐÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3501,219 @@ msgstr ""
 "\">ÐÐÑ ÐÑÐÑÐÑ</a> Ð ÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐ âÐÑÐÐÐÑÐÑÐ "
 "ÐÑÐÑÐÐÐâ Ñ ÐÐÐÐÑÑ âÐÐÐÐÑâ."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "ÐÐÑÐÐ ÑÐ ÐÐ ÐÑÐÑÐÐ Ñ ÐÐÑÐÑÑ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "ÐÐÑÑÐÐÐÑÑ ÑÐ ÐÑÐÑ ÑÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÑÑÐÐ ÑÐÐ"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÐÑÑÐÐÐÐ ÐÐÐÐÐ ÑÐÐ"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "ÐÑÐÐÐ"
+msgid "_Call"
+msgstr "_ÐÐÐÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÑÐ:"
+msgid "_Microphone"
+msgstr "ÐÐ_ÐÑÐÑÐÐ"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "ÐÑÐÑÑÑÐÑÐ ÐÐÐÐÑÐÑÑ"
+msgid "_Camera"
+msgstr "_ÐÐÐÐÑÐÑÐ"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÑÑÐÐÐÐ"
+msgid "_Settings"
+msgstr "ÐÐ_ÐÐÑÐÐÐÑÐ"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "ÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐ:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "ÐÑÐ_ÐÐÐÐ"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "ÐÑÐÐÐÐÐ"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "ÐÐ_ÐÐÑ"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÐ"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_ÐÐÐÑÐÐÑ"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "ÐÑÐÐÐÑÐÑÐ _ÐÑÐÑÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "ÐÐÐÑÐÑ ÐÐ"
+msgid "Swap camera"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÑ"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "ÐÐÐÑÐ ÐÐ"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ:"
+msgid "Maximise me"
+msgstr "ÐÐÐÑÐÑ ÐÐ"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "ÐÐÑÐÑÐ ÐÐÑÐ"
+msgid "Disable camera"
+msgstr "ÐÑÐÑÑÑÐÑÐ ÐÐÐÐÑÐÑÑ"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "ÐÑÐÐÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÑÑÐÐÑÑÐÐ ÐÐÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐ"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "ÐÐÐÐÑÐÐÑÐ ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "ÐÐÐÐÑÐÐÑÐ ÐÑÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÑ"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÐÑÐÐÐÑ ÐÐÑÐÐ"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÐÑÐÐÐÑ ÐÐÐÐÐ"
+msgid "Show dialpad"
+msgstr "ÐÑÐÐÐÐÐ ÐÑÐÑÑÐÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "ÐÐÐÐÐÐÐÑÐ"
+msgid "Display the dialpad"
+msgstr "ÐÑÐÐÐÐÐÑÐ ÐÑÐÑÑÐÐÐÐ"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "ÐÐÑÐÑÐ ÐÐÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "ÐÐÐÐÐ ÐÐÐÐÐ"
+msgid "Toggle video transmission"
+msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÐÑÐÐÐÑ ÐÐÐÐÐ"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_ÐÐÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "ÐÐÑÐÑÐ ÐÐÑÐ"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_ÐÐÐÐÑÐÑÐ"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_ÐÐÐÑÐÐÑ"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "ÐÐÑÑÑÐ/ÐÑÐÑÑÑÐ ÐÑÐÐÐÑ ÐÐÑÐÐ"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "ÐÑÐÐÐÑÐÑÐ _ÐÑÐÑÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "ÐÐÐÐÐ ÐÐ ÐÐÐÐÑÐÑÐ:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "ÐÐ_ÐÐÑ"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "ÐÐÐÐÐÐÐÑÐ"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑÐÑÐ:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "ÐÐ_ÐÑÐÑÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "ÐÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "ÐÐ_ÐÐÑÐÐÐÑÐ"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÑ:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "ÐÑÐ_ÐÐÐÐ"
+msgid "Audio"
+msgstr "ÐÑÐÐÐ"
+
+#: ../src/empathy-chat-window.c:285
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "ÐÐ ÐÐÑÐÐÑÐÐ ÐÐÐÑ ÐÑÐÐÐÑ?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÑÐÐÐ %s. ÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑÑÐ "
+"ÐÐÑÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ."
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÑÐÐÐ %u ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ. ÐÐÑÐÑÐ ÐÑÐÐÐÑÐ "
+"ÐÐÐÐÐÐÐ ÐÑÐÑÑÐ ÐÐÑÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ."
+msgstr[1] ""
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÑÐÐÐ %u ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ. ÐÐÑÐÑÐ ÐÑÐÐÐÑÐ "
+"ÐÐÐÐÐÐÐ ÐÑÐÑÑÐ ÐÐÑÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ."
+msgstr[2] ""
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÑÐÐÐ %u ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ. ÐÐÑÐÑÐ ÐÑÐÐÐÑÐ "
+"ÐÐÐÐÐÐÐ ÐÑÐÑÑÐ ÐÐÑÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ."
+msgstr[3] ""
+"ÐÐÑÐÐÑÐÑÐÐ ÐÐÐÐ ÐÑÐÐÐÑÐ ÐÐÑÐ ÐÐÐÑÑÑÐÐÐ ÑÐÐÐÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ. ÐÐÑÐÑÐ ÐÑÐÐÐÑÐ "
+"ÐÐÐÐÐÐÐ ÐÑÐÑÑÐ ÐÐÑÑÐÐ ÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "ÐÐ ÐÐÐÑÑÑÐÐ %s?"
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"ÐÐÑÐÑÐ ÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐ ÐÑÐÑÑÐ ÐÐÑÑÐÐ ÐÐ ÐÐÐ ÑÐÐÐ ÐÐ ÑÐÑÐÐÑÐ ÑÐÐ ÐÐÐ ÑÐÑ ÑÐ "
+"ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ."
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "ÐÐÑÐÐÑÐ ÐÑÐÐÐÑ"
+
+#: ../src/empathy-chat-window.c:330
+#| msgid "Level "
+msgid "Leave room"
+msgstr "ÐÐÐÑÑÑÐ ÑÐÐÑ"
+
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3679,7 +3722,7 @@ msgstr[1] "%s (%d ÐÐÐÑÐÑÐÑÐÐÐ)"
 msgstr[2] "%s (%d ÐÐÐÑÐÑÐÑÐÐÐÑ)"
 msgstr[3] "%s (ÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3688,7 +3731,7 @@ msgstr[1] "%s (Ð %u ÐÑÑÐÐ)"
 msgstr[2] "%s (Ð %u ÐÑÑÐÐÑ)"
 msgstr[3] "%s (Ð ÑÐÐÐÐ ÐÑÑÐÐ)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3697,7 +3740,7 @@ msgstr[1] "%s (%d ÐÐÐÑÐÑÐÑÐÐÐ ÐÐ ÐÑÑÐÐÐÑ)"
 msgstr[2] "%s (%d ÐÐÐÑÐÑÐÑÐÐÐÑ ÐÐ ÐÑÑÐÐÐÑ)"
 msgstr[3] "%s (ÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ ÐÐ ÐÑÑÐÐÐÑ)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3706,11 +3749,11 @@ msgstr[1] "%s (%d ÐÐÐÑÐÑÐÑÐÐÐ ÐÐ ÑÐÐÑ)"
 msgstr[2] "%s (%d ÐÐÐÑÐÑÐÑÐÐÐÑ ÐÐ ÑÐÐÑ)"
 msgstr[3] "%s (ÑÐÐÐÐ ÐÐÐÑÐÑÐÑÐÐÐ ÐÐ ÑÐÐÑ)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
 msgstr "ÐÐÐ:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3719,69 +3762,69 @@ msgstr[1] "ÐÐÑÐÐ %d ÐÐÑÑÐÐ."
 msgstr[2] "ÐÐÑÐÐ %d ÐÐÑÑÐÐ."
 msgstr[3] "ÐÐÑÐÐ ÑÐÐÐÑ ÐÐÑÑÐÑ"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "ÐÐÑÐ ÐÐÑÑÐÑ."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_ÐÑÐÑÑÐ"
+msgid "_Conversation"
+msgstr "_ÐÐÐÐÐÐÐÑ"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_ÐÑÐÑÐÑÐÑ"
+msgid "C_lear"
+msgstr "_ÐÑÐÑÑÐ"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "ÐÐÐÑÐ _ÑÐÐÑÐÐ"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ _ÑÐÑÐÐÑÐ"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "ÐÐÐÐÐÐ _ÑÑÐÑÐÐÐÐâ"
+msgid "Notify for All Messages"
+msgstr "ÐÐÐÐÐÑÑÐ ÐÐ ÑÐÐ ÐÐÑÑÐÐ"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÐÐ"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÑÐÐ"
+msgid "Invite _Participantâ"
+msgstr "ÐÐÐÐÐÐ _ÑÑÐÑÐÐÐÐâ"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "ÐÐÐÐÐÑÑÐ ÐÐ ÑÐÐ ÐÐÑÑÐÐ"
+msgid "C_ontact"
+msgstr "_ÐÑÐÑÐÑÐÑ"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_ÐÐÐÐÐÐÐÑ"
+msgid "_Tabs"
+msgstr "_ÐÐÑÑÐÐÐ"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_ÐÑÐÐÑÐ ÐÐÑÑ"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "ÐÐÐÑÐÐÐ ÑÐÐÐ ÐÐ _ÑÐÑÐÐÑÐ"
+msgid "_Previous Tab"
+msgstr "_ÐÑÐÑÑÐÐÐÐ ÐÐÑÑ"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_ÐÐÐÐÐÑÐ ÐÐÑÑ"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_ÐÑÐÑÑÐÐÐÐ ÐÐÑÑ"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_ÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "ÐÑÐÐÐÐÐ _ÑÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÐÐ"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_ÐÐÑÑÐÐÐ"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "ÐÑÐÐÐÑÑÐ ÑÐÐÐÑÐÐ _ÐÐÑÐÐ"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_ÐÐÐÐÐÐÐ ÐÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐÐ"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_ÐÑÐÐÑÐ ÐÐÑÑ"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3795,100 +3838,100 @@ msgstr "ÐÐÐÐ"
 msgid "Auto-Connect"
 msgstr "ÐÑÑÐÐÐÑÑÐÐ ÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "ÐÑÐÐÐ ÐÐÐÑÐÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s ÐÐÑ ÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÑÐÐÐÑÐ?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s ÐÐÑ ÐÐÐÐ. ÐÐÐÐÑÐ ÐÐ ÐÐ ÑÐ ÑÐÐÐÑÐ?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐ %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "_ÐÐÐÐÑÐ"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_ÐÐÐÐ ÑÐ"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÐ _ÐÐÐÐÐÐ"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÐÐ ÐÐ %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐÐÑ"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "ÐÐÐÐÐÐÐÑÐ ÐÐ ÑÐ ÐÑÐÐÑÑÐÐÑÐ Ñ %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s ÐÐÑ ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÑÐÐÑÐ %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_ÐÐÐÐÑ"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_ÐÑÐÐÑÑÑÐ ÑÐ"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s ÐÐÑ ÐÐÐÐÐÐ ÐÐ ÑÐ ÐÑÐÐÑÑÐÐÑÐ %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "ÐÐÐÐÐÐÐ ÑÑÐ ÐÐ ÑÐ ÐÑÐÐÑÑÐÐÑÐ Ñ %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ ÐÐ %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
 msgstr "ÐÐÑÑÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s ÑÑÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐ ÐÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐ"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3898,105 +3941,105 @@ msgstr ""
 "ÐÐÑÑÐÐ: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÐÑÐ"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s ÐÐ %s ÐÑÐ %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s ÐÐ %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "ÐÑÐÐÐÐ â%sâ ÐÐ %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "ÐÐÑÐÐ â%sâ ÐÐ %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÑ â%sâ ÐÐ %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÑ ÐÐÑÐÑÐÐÐ"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ â%sâ ÐÐ %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑ ÐÐÑÐÑÐÐÐ"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "â%sâ ÑÐ ÐÑÐÐÑÐÐ ÐÐ %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " â%sâ ÑÐ ÐÐÑÐÐÑ ÐÐ %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "ÐÑÐÐÐÑ ÐÐÑÐÑÐÐÐ ÑÐ ÐÐÐÑÑÐÐ"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "ÐÐÐÐÐ ÐÐ ÐÐÐÐÐÐÑ ÐÑÑÐÐ ÑÑÑÐÐÐ"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "ÐÑÐÐÐÑÐÐÐÐ ÐÐÑÐÐÑÐÑÐÑ ÐÐÑÐÑÐÐÐ â%sâ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "ÐÑÐÐÐÐ ÑÐÑ ÐÐÑÐÑÐÐÐ â%sâ"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "ÐÐÑÐÑÐÐÐ"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "ÐÑÐÐÑÑÐÐÐ"
 
@@ -4021,166 +4064,193 @@ msgid "Import Accounts"
 msgstr "ÐÐÐÐÐÑÐ ÐÐÐÐÐÐ"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "ÐÐÐÐÐ"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "ÐÑÐÑÐÐÐÐ"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "ÐÐÐÐÑ"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:389
 msgid "Provide Password"
 msgstr "ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
 msgstr "ÐÐÐÐ ÑÐ ÐÑÐÐÐÐÑÑÐ"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr "ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐ ÐÐ ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ."
+
+#: ../src/empathy-roster-window.c:660
 msgid "No match found"
 msgstr "ÐÐÐÐ ÐÐÐÐÐÐÐÑÐ"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:765
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr ""
+"ÐÐÐÐÐÐÑÐ, %s ÐÐÐÐÐÐ ÐÐ ÐÐÐÑ ÐÐÑÐ ÐÐÑÐÑÑÐÐÐ ÑÐÐ ÐÐÐ ÐÐ ÐÐÑÑÐÑÐÑÐ ÐÐÑ %s "
+"ÑÐÑÑÐÐÑ."
+
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "ÐÐÑÑÐÑÐÑ ÑÐÑÑÐÐÑ..."
+
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "ÐÐÑÐÐÑÐ"
+
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "ÐÐÐÐÐÐ ÑÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "ÐÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "ÐÐÑÐÐÑÐ"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "ÐÐÐÑÐÐ %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1138
 msgid "Top up account credit"
 msgstr "ÐÐÐÑÐÐÑÐ ÐÑÐÐÐÑ ÐÐÐÐÐÐ"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr "ÐÐÐÑÐÐ..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
 msgstr "ÐÑÐÑÐÑÐÑ"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2131
+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:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "ÐÐÑÐÑÐ ÐÐ ÑÐÑÑÑÐÑÐ %s ÐÐ ÐÐÑÑÐ ÐÐÐÐ ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ."
+
+#: ../src/empathy-roster-window.c:2419
 msgid "Contact List"
 msgstr "ÐÐÐÑÐÐ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "ÐÑÐÑÐÑÐÑÐ ÐÐ _ÐÐÐÐ"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "ÐÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_ÐÐÐÐ ÑÐÐÐÐÐÐÑâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "ÐÑÐÐÐÑÐ Ñ _ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "ÐÐÐÐ _ÐÐÐÐÐâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "ÐÑÐÐÑÑÐÐ ÑÐ _ÐÐÐÑÐÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contactsâ"
+msgstr "_ÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "ÐÑÐÐÐ ÐÐÐÑÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "ÐÑÐÐÐÑÐ _ÐÐÑÐÑÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "Ð_ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "ÐÐÐ_ÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "ÐÐÐÐ _ÐÐÐÐÐâ"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐ _ÐÐÐÑÐÑÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "ÐÐÐÐÑ ÐÐÑÐÐÐÐÐ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "ÐÑÐÑÐÑÐÑÐ ÐÐ _ÐÐÐÐ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "Ð_ÐÐÐÐÐ"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_ÐÐÑÑÐÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "ÐÑÐÐÐÐÐ _ÐÑÐÑÐÐÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "ÐÑÐÐÐÑÐ Ñ _ÑÐÐÑÐÑ ÐÑÐÑÐÑÐÑÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "ÐÐÑÐÑÐÑ ÐÑÐÐÐ _ÐÐÐÐÑ"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "ÐÐÑÐÑÐÑ ÐÑÐÐÐ _ÑÑÐÑÑ"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "Ð_ÐÐÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "ÐÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ ÑÐ _ÐÐÐÑÐÑÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_ÐÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "Ð_ÐÑÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_ÐÐÐÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "ÐÑÐÐÐÑÐ _ÐÐÑÐÑÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_ÐÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Joinâ"
 msgstr "_ÐÑÐÐÑÑÑÐ ÑÐâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "_ÐÐÐÐ ÑÐÐÐÐÐÐÑâ"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "ÐÐÐ_ÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "ÐÐÑÐÐ _ÐÐÐÐÑÐ"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_ÐÐÐÐ"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "ÐÑÐÐÑÑÐÐ ÑÐ _ÐÐÐÑÐÐÐÐ"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contactsâ"
-msgstr "_ÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐâ"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "ÐÑÐÐÐ ÐÐÐÑÐÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "ÐÐÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4263,22 @@ msgstr ""
 "ÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ: %s\n"
 "ÐÐÐÐÐÐÐ: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "ÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑÑÐÑÐ ÑÐÐÑÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "ÐÐ ÐÐÐÑ ÐÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑÑÐÑÐ ÑÐÐÑÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÑÐÐÑÐÐ ÑÐÐÐ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "ÐÑÐÐÑÑÐÐ ÑÐ ÑÐÐÐ"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4287,10 @@ msgstr ""
 "ÐÐÐÐ ÑÐÐÑÐÑÐ ÐÐÐ ÑÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐ ÑÐÐÐ ÐÐ ÑÐÐÑÐÑ."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_ÐÐÐÐ:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4224,313 +4298,314 @@ msgstr ""
 "ÐÐÐÑÐÑÐ ÑÐÑÐÐÑ ÐÐÑÐ ÑÐÐÑÑÐÐÐ ÑÐÐÐ, ÐÐÐ ÐÑÑÐÐÐÑÐ ÐÑÐÐÐÐ ÐÐÐ ÑÑ ÑÐÐÐ ÐÐ "
 "ÑÐÑÐÐÑÑ ÐÐ ÐÐÑÐÐ ÐÐÐ ÑÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "ÐÑÐÐÑÑÐÐ ÑÐ ÑÐÐÐ"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "ÐÐ ÐÐÐÑ ÐÐ ÑÑÐÑÐÐ ÑÐÐÑÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "ÐÐÐÑÐÐ ÑÐÐÐ"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_ÐÐÐÐ:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÐÑÐÐÑÐÐÐ"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "ÐÐÑÑÐÐ ÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "ÐÐÐÐ ÑÐÐÐÐÐÐÑ"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "ÐÑÐÑÐÑÐÑ ÑÐ ÐÑÐÑÐÐÐÐ"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "ÐÑÐÑÐÑÐÑ ÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "ÐÐÐÐÐ ÑÐ ÐÐ ÐÐÐÐ"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "ÐÐÐÐÐ ÐÐÑÐ ÐÐ ÐÐÐÐ"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "ÐÐÐÐÐ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "ÐÐÑÐ"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "ÐÐÑÐ"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "ÐÐÐ, ÐÑÐÐ, ÐÐÑÐÐ ÑÐÐ!! ÐÐ ÑÐÐ ÐÐÐÑÐ ÑÐÐÐÐ!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "ÐÐÑÐ, ÑÑÐ ÑÐ ÐÐÐÐ, ÐÐÑÐÐÐ??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "ÐÐÐÐ ÑÑÐ ÑÐ ÐÐÐÐ?? ÐÐÐÐ ÑÐ ÐÐÑÐ, ÑÐÑÐÐÐ ÑÑ ÐÐ ÑÐ!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "ÐÑÐ ÑÑ ÑÐ ÑÐÑÐÐÐ, ÐÐÑÐ?? ÐÑÐÐÐÐ??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "ÐÐÐÐ ÑÑÐ?? ÐÐÐ ÐÐÑÑ, ÑÐÑÐÐÐ ÑÑ ÐÐ ÐÐÑÑ!! ÐÐÐ ÐÐÐÐ!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "ÐÐÐ ÐÑÐÑÐÐ, ÐÐÑÐ ÑÐ ÐÑÐÐÐÐÑÐ ÐÐÐÑ."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "ÐÐÑÑÐÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐ _ÑÐÐÑÐÐÐ"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ _ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐÐ"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "ÐÐÐÐÐÐ"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "ÐÐÐÐÑÐÑÐ"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "ÐÐÐÐÑÐÐ ÑÐÑÐÐÑÐ Ñ:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_ÐÐÐÐ ÑÐÑÐÐÑÐ:"
+msgid "new ta_bs"
+msgstr "ÐÐÐÐÐ _ÑÐÐÐÑÑÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐ _ÐÐÑÑÑÐÐ ÐÐÐ ÐÐÑÐÐÑ"
+msgid "new _windows"
+msgstr "ÐÐÐÐÐ _ÐÑÐÐÐÑÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "ÐÑÐÑÑÑÐ ÐÐÑÐÐ ÐÐÐÐ ÑÐÐ _ÐÐÑÑÑÐÐ ÐÐÐ ÐÐÑÐÐÑ"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ Ñ ÐÐÐÐÐÑÑÐÑÐÐÑ ÐÐÐÐ"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÑ ÐÐÐÑ ÐÑÑÐÐÑ ÐÑÐÐÐ ÐÐÑÑÐ ÑÐÑÐÐÑÐ, ÐÐÐ ÐÐÐÐ ÐÐ "
-"ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÑÐÐÐ. ÐÐÐ ÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÐÐÑÐÐÐ ÑÑÑÐÑÐ ÑÑÐÐÐ "
-"ÑÑÐÐÐÐ ÐÐÐ ÐÑÑÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐÐÐ, ÐÐÐÑÑÐÑÑÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐ Ð "
-"ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ."
+msgid "Log conversations"
+msgstr "ÐÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐÑÐ"
 
-#: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÑÐÐÑ"
+#: ../src/empathy-preferences.ui.h:10
+msgid "Behavior"
+msgstr "ÐÐÐÐÑÐÑÐ"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐÐ ÑÐ ÐÑÐÐÐ"
+msgid "General"
+msgstr "ÐÐÑÑÐ"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ _ÑÐÑÐÐÑÐ ÐÐÑÑ Ñ ÑÐÐÑÑÑ"
+msgid "_Enable bubble notifications"
+msgstr "_ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "ÐÐÐÐÑÑÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÐÐ:"
+msgid "Disable notifications when _away or busy"
+msgstr "ÐÑÐÑÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÑÐÐ _ÐÐÑÑÑÐÐ ÐÐÐ ÐÐÑÐÐÑ"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "ÐÐÑÑÐ"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ _ÑÐÑÐÐÑÐ ÐÐÑÑ Ñ ÑÐÐÑÑÑ"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐ:"
+msgid "Enable notifications when a contact comes online"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÑÐÐÑ"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "ÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐ:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ ÐÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐÐ ÑÐ ÐÑÐÐÐ"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "ÐÐÐÐÐÑÑÐÑÐ"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ:"
+msgid "_Enable sound notifications"
+msgstr "ÐÐÐÐÑÑÐ _ÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÑÐ"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "ÐÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐÑÐ"
+msgid "Disable sounds when _away or busy"
+msgstr "ÐÑÐÑÑÑÐ ÐÐÑÐÐ ÐÐÐÐ ÑÐÐ _ÐÐÑÑÑÐÐ ÐÐÐ ÐÐÑÐÐÑ"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "ÐÐÐÐÐÑÑÐÑÐ"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "ÐÑÑÑÐ ÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "ÐÐÑÑÐ"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "ÐÑÐÐÐÑÐÐÑÑ"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "ÐÐÑÐÑÑÐ ÑÐÐÐÑÐÑÐ _ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÑÑÐÑ ÐÐÐÐÐÑÐÑ ÐÐÐÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"ÐÐÐÑÐÐÐ ÑÐÑÐÐÑÑ ÐÐÐÐÑÐÑÐ ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÑÑÐÑÐÐÑÐ ÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÑÐÑ "
-"ÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ Ð ÐÑÐÐÐÐ.  ÐÐÐ ÐÐÐÑÐÐÐÐÑÐ ÑÐ ÐÐÑÐ ÑÐÑÐÐ ÐÐ 1. ÐÐÑÐÐÐÐÐ."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÐÐ _ÑÐÐÑÐÐÐ"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "ÐÑÐÐÐÐÐ ÑÐÐÑÐÐ _ÐÑÐÑÐÑÐÑÐ Ñ ÑÐÐÐÐÐ"
+"ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐ ÑÐÐÐ ÐÐ ÐÐÑ ÐÐÐÑ ÐÑÑÐÐÑ ÐÑÐÐÐ ÐÐÑÑÐ ÑÐÑÐÐÑÐ, ÐÐÐ ÐÐÐÐ ÐÐ "
+"ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐ ÑÐÑÑÐÐÑÐÐÐ. ÐÐÐ ÐÐ ÐÐÐ ÐÐÑ ÑÐÐÐÐÐÑÐÐÐ ÑÑÑÐÑÐ ÑÑÐÐÐ "
+"ÑÑÐÐÐÐ ÐÐÐ ÐÑÑÐÑÐ ÐÐ ÐÑÐÐÐ ÐÐÐÐÐÐ, ÐÐÐÑÑÐÑÑÐ ÐÐ ÐÑÐÑÑÑÐÑÐ ÑÐÐÐÑÐÑÐ ÐÐÑÐÐÐ Ð "
+"ÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "ÐÐÑÑÐ"
+msgid "_Publish location to my contacts"
+msgstr "ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÐ _ÐÑÐÑÐÑÐÑÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÑÐ"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"ÐÐÐÑ ÑÐÐÑÐÐ ÑÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÐ ÑÐÐÐ ÐÐÐ ÑÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐÐ "
-"ÑÐÑÐÐÐÐ."
+"ÐÐÐÑÐÐÐ ÑÐÑÐÐÑÑ ÐÐÐÐÑÐÑÐ ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÑÑÐÑÐÐÑÐ ÐÐÑÐÐÑÐÐÐ ÐÐÐÐÑÐ Ð ÐÐÑÐÑ "
+"ÐÐÐÐÑÐÑÐ ÐÐÑÐ ÐÑÐÐ Ð ÐÑÐÐÐÐ.  ÐÐÐ ÐÐÐÑÐÐÐÐÑÐ ÑÐ ÐÐÑÐ ÑÐÑÐÐ ÐÐ 1. ÐÐÑÐÐÐÐÐ."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "ÐÐÐÐ"
+msgid "_Reduce location accuracy"
+msgstr "ÐÐÐÑÐ _ÑÐÑÐÐÑÑ ÐÐÐÐÑÐÑÐ"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "ÐÐÑÐÑÐÐÑÐ:"
+msgid "Privacy"
+msgstr "ÐÑÐÐÐÑÐÐÑÑ"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_ÐÐÐ ÑÐ ÐÐÐÐÐÐ ÐÐÐÐÐ ÐÐÐÑÐÑÐÑÐ"
+msgid "_GPS"
+msgstr "_ÐÐÐ"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_ÐÐÐÐÐÐÐ ÑÐÐÐÑÐÐ"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_ÐÐÐÐÑÑÐ ÐÐÐÐÐÑÑÐÑÐ Ñ ÐÐÐÐÑÐÑÐÐÐ"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_ÐÑÐÐÐ (ÐÐ, ÐÐÐÐÑÐÐ)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "ÐÐÐÐÑÑÐ _ÐÐÑÑÐÐ ÐÐÐÐÐÑÑÐÑÐ"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_ÐÐÐ"
+msgid "Location sources:"
+msgstr "ÐÐÐÐÑÐ ÐÐÐÐÑÐÑÐ:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_ÐÑÐÐÐ (ÐÐ, ÐÐÐÐÑÐÐ)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"ÐÐÐÑ ÑÐÐÑÐÐ ÑÐÐÐÐÐ ÐÑÐÐÑÑÐÐÑÐ ÑÐÐÐ ÐÐÐ ÑÐÐÐÐÐ ÐÐ ÐÐÑÐ ÐÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐÐ "
+"ÑÐÑÐÐÐÐ."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_ÐÑÐÐÑÐÑ ÑÐÑÐÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐ"
+msgid "Enable spell checking for languages:"
+msgstr "ÐÐÐÐÑÑÐ ÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÐÐ:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "ÐÐÑÐÐÐ ÐÐÐÐÑÐÑÑ ÐÐÑÐÐ _ÐÑÐÑÐÑÐÑÐÐÐ"
+msgid "Spell Checking"
+msgstr "ÐÑÐÐÐÑÐ ÐÐÑÐÑÐ"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_ÐÐÐÐ ÑÐÑÐÐÑÐ:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "ÐÐÐÑÐ _ÑÐÑÐÐÑÑ ÐÐÐÐÑÐÑÐ"
+msgid "Variant:"
+msgstr "ÐÐÑÐÑÐÐÑÐ:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "ÐÐÐÐ"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "ÐÑÐÑÐ"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_ÐÐÐÑÐ"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ ÐÐÐÐÐÐ"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "ÐÑÐÑ. ÐÐÐÐÑÑ"
+msgid "Redial"
+msgstr "ÐÐÐÐÐÐ ÐÐÐÐ"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "ÐÐÑ. ÐÐÐÐÑÑ"
+msgid "V_ideo"
+msgstr "Ð_ÐÐÐÐ"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "ÐÑÐÑ. ÐÐÐÐÐ"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "ÐÐÐÐÐÐÑÑÐÂÐÐÐÐÑÑÂÐÂÐÑÐÑÑÐÐÐÂÐÐÂÑÐÑÐÑÂÐÐÐÐÐ"
+msgid "Video Preview"
+msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "ÐÐÐÐÑÑÐÂÐÐÐÐÑÑÂÐÂÑÐÑÐÂÐÐÐÐÐ"
+msgid "Video On"
+msgstr "ÐÐÑ. ÐÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÑÑ, ÐÐÐ ÐÐ ÑÐÑÐ ÐÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ ÐÐÐÐÐÐ"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "ÐÑÐÐÐÐÐ"
+msgid "Camera Off"
+msgstr "ÐÑÐÑ. ÐÐÐÐÑÑ"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "ÐÐÐÐÐÐ ÐÐÐÐ"
+msgid "Disable camera and stop sending video"
+msgstr "ÐÐÐÐÐÐÑÑÐÂÐÐÐÐÑÑÂÐÂÐÑÐÑÑÐÐÐÂÐÐÂÑÐÑÐÑÂÐÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "Ð_ÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "ÐÑÐÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "ÐÑÐÑ. ÐÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "ÐÐÐÐÑÑÐ ÐÐÐÐÑÑ, ÐÐÐ ÐÐ ÑÐÑÐ ÐÐÐÐÐ"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "ÐÐÑ. ÐÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "ÐÐÑ. ÐÐÐÐÑÑ"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "ÐÐÐÐÑÑÐÂÐÐÐÐÑÑÂÐÂÑÐÑÐÂÐÐÐÐÐ"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "ÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
 
@@ -4597,16 +4672,16 @@ msgid ""
 msgstr ""
 "ÐÐÐÐÑÐÐÐ ÑÐÑÐÐÐÐÐ ÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ ÐÐ ÑÐÐÑÐÐÐ ÐÑÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐ."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "ÐÐÐÐÐÐ ÑÑÐÑÐÐÐÐ"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÑÐ Ñ ÐÐÐÑ ÑÐÐÐÐÐÐÑ:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "ÐÐÐÐÐÐ"
 
@@ -4630,23 +4705,28 @@ msgstr ""
 msgid "<account-id>"
 msgstr "<ÐÐÐÐÑÐÑÐÐÐÑÐÑÐ ÐÐÐÐÐÐ>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+#| msgid "Show Balance in contact list"
+msgid "Show account assistant"
+msgstr "ÐÑÐÐÐÐÑÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐ"
+
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
 msgstr "â ÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÐ"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
 msgstr "ÐÐÐÐÐÐ ÐÐÑÐÐÐÐÑÐ"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "ÐÑÐÐÐÐÐ ÐÐÑÐÐÐÑ ÑÑÐÑÐÑ"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "â ÐÑÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "ÐÑÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ"
 
@@ -4654,39 +4734,39 @@ msgstr "ÐÑÐÐÐÑÐÑÐ ÐÑÐÑÐÐÐ ÐÐÑÐÐÐÐÑÐ"
 msgid "- Empathy Chat Client"
 msgstr "â ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÑÐÐ ÐÐ ÑÐÑÐÐÑÐ"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "ÐÐÐÐÐÐÑÐ"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "ÐÐÐÐÑÐ"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "ÐÐÐÐ ÑÐ"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "ÐÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐ"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "ÐÐÐÐÑ"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "ÐÑÐÑÐÐÑÐ"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "ÐÐÐÐÐÐÐÐ"
 
@@ -4697,32 +4777,200 @@ msgstr "%s ÑÐ ÐÐÐÑÑÐÐ ÐÐ ÐÐÑ ÐÐÐÐ, ÐÐÐ ÑÑÐ ÐÐ ÐÐÐÐ
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "Ð"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "ÐÐ ÑÐÐÐÑÑ"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "ÐÑÐÑÐÑ"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "ÐÑÐÑÐÑÐ"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "ÐÐÑÐ ÑÑÐÐÑÑÐÐ ÑÑÐÑÐ ÑÐ %s."
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "ÐÐÐÐÐÐÑÐ, ÐÐÐ ÐÐÐÐÑÐ ÐÐÐÐÑÐÐ ÐÑÐÐÐÑÐ ÐÐ ÐÐÐÑ ÐÐÐÐÐ."
+
+#: ../src/empathy-call-window.c:3213
+#| msgid "Top Up..."
+msgid "Top Up"
+msgstr "ÐÐÐÑÐÐ"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_ÐÐÐÑÐÐÐ ÐÐÐÐÑÐÐÑ ÑÐÐÐÐ"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "ÐÐÐÐÑÐÐ ÐÐÐÐ ÐÐÐÐÐ"
+
+#~ msgid "Call volume"
+#~ msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐ"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "ÐÐÑÐÐÐ ÐÐÑÐÐ ÐÐÐÐÐÐ, Ñ ÐÑÐÑÐÐÑÐÐÐ."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "ÐÐÑÐÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "ÐÐ ÐÐ ÑÐ ÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "ÐÑÑÑÐ ÐÑÐÐÑÑÑÐÐ ÐÐÑÐ ÐÐÐÑÐÐÐÐ"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "ÐÐÐÐÐ %s ÑÐ ÐÐÐÐÑÐÐ ÐÑÑÐÐ %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "ÐÐÐÐÐ %s ÐÐ ÐÐÐÐ ÐÐÑÐ ÑÑÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐÑÐ."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "ÐÐÐÑÐÐÐ ÐÐÑÐ ÐÐÐ ÐÐÐÐÐÐ"
+
+#~ msgid "Edit %s"
+#~ msgstr "ÐÐÐÐÐÐ %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "ÐÐ_ÐÐÑÑÐ"
+
+#~ msgid "Personal Information"
+#~ msgstr "ÐÐÐÐÑÐ Ð ÐÑÐÑÐÐÑ"
+
+#~ msgid "Ungrouped"
+#~ msgstr "ÐÐÐÑÑÐÐÑÐÐÐ"
+
+#~ msgid "Favorite People"
+#~ msgstr "ÐÐÐÑÐÐÐ ÑÑÐÐ"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "ÐÐÐ_ÐÐÐ"
+
+#~ msgid "Select a contact"
+#~ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "ÐÐÐÐÐÑÐÑÐ ÐÑÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ"
+
+#~ msgid "New contact preview"
+#~ msgstr "ÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑÐ ÐÐ ÑÐÐÑÐÑ ÐÐÐÐ ÑÐ ÐÐÑÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐÐÐ."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contactsâ"
+#~ msgstr "_ÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐâ"
+
+#~ msgid "Link Contacts"
+#~ msgstr "ÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlinkâ"
+#~ msgstr "_ÐÐÐÐÐÐÐâ"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ."
+
+#~ msgid "_Link"
+#~ msgstr "_ÐÐÐÐÐ"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "ÐÐ ÑÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ â%sâ?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "ÐÐ ÐÐ ÑÑÐ ÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐ ÐÑÐÑÐÑÐÑÐ? ÐÐÐÐ ÑÐÑÐ "
+#~ "ÑÐÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÐ ÐÐÐÑÐÐÑÐ Ñ ÐÐÑÐÐÐÐ ÐÑÐÑÐÑÐÑÐ."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_ÐÐÐÐÐÐÐ"
+
+#~ msgid "Contact ID:"
+#~ msgstr "ÐÐ ÐÑÐÑÐÑÐÑÐ:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ð_ÐÑÐÐÑ"
+
+#~ msgid "Send _Video"
+#~ msgstr "ÐÐÑÐÑÐ _ÐÐÐÐÐ"
+
+#~ msgid "C_all"
+#~ msgstr "_ÐÐÐÐÐÐ"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "ÐÐÑÑÐÐÐÑÐ ÐÐÑÐ ÐÑÐÑÑÑÑÐÐ Ð ÑÑÐÐÑÑÐÐ ÑÑÐÑÐ"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐÐ ÐÐÑÐÑÐÐÐ."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "ÐÐÐÐÑÐÐÐ ÐÑÐÑÐÑÐÑ ÐÐÑÐ ÐÐ ÐÐÐÐ."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "ÐÐÐÐ ÑÐÑÐ ÐÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÐ, ÐÐÐÐÐÐÑÐÐÑÐ ÑÐÐÑÐ ÐÐÐÐÐÐ.\n"
+#~ "ÐÐ ÐÐ ÑÐÐÑÑÐÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐ?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "ÐÐÐÐÐÐÐÑÐ"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "ÐÐÐÐÐÐÐÑÐ"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "ÐÐÐÐÐÐÐÑÐ"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "ÐÐÐÐÐÐÐÑÐ"
+
+#~ msgid "_Personal Information"
+#~ msgstr "ÐÐÑÐÐ _ÐÐÐÐÑÐ"
+
+#~ msgid "Input level:"
+#~ msgstr "ÐÐÐÐÐÐ ÐÐÐÐ:"
+
+#~ msgid "Input volume:"
+#~ msgstr "ÐÐÑÐÐÐ ÑÐÐÐÐÐÐ ÐÐÑÐÐ:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_ÐÑÐÐÑÐÑ ÑÐÑÐÐÑÐ Ñ ÐÐÐÐÐ ÐÑÐÐÐÑÐÐÐ"
+
 #~ msgid "All"
 #~ msgstr "ÐÐÐ"
 
diff --git a/po/sr latin po b/po/sr latin po
index 4c3713b..700b43c 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -11,524 +11,547 @@
 # Reviewed on 11.05.2009 by MiloÅ PopoviÄ <gpopac gmail com>
 # MiloÅ PopoviÄ <gpopac gmail com>, 2010.
 # Branko KokanoviÄ <branko kokanovic gmail com>, 2011.
-# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011.
+# Miroslav NikoliÄ <miroslavnikolic rocketmail com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2011-09-19 19:10+0000\n"
-"PO-Revision-Date: 2011-09-19 11:52+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empath";
+"y&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-08 15:44+0000\n"
+"PO-Revision-Date: 2012-02-09 11:53+0200\n"
 "Last-Translator: Miroslav NikoliÄ <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 :    n%"
-"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.6.1\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
-msgstr ""
-"Äaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
-"Äaskanje"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Internet pismonoÅa"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "Program za brze poruke"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
 msgstr "Dopisivanje preko Internet pismonoÅe"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "Program za brze poruke"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr ""
+"Äaskajte na Gugl razgovoru, Fejsbuku, MSN-u i na mnogim drugim servisima za "
+"Äaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "Uvek otvara poseban prozor za nova Äaskanja."
+msgid "Connection managers should be used"
+msgstr "Da li Äe biti koriÅÄen upravnik mreÅom"
 
+# Nije connect veÄ disconnect!!! ~MiloÅ
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
-msgid "Call volume"
-msgstr "JaÄina zvuka poziva"
+msgid ""
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr ""
+"Da li treba koristiti upravnika mreÅe za automatsko prekidanje i ponovno "
+"uspostavljanje veze."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Call volume, as a percentage."
-msgstr "JaÄina zvuka poziva, u procentima."
+msgid "Empathy should auto-connect on startup"
+msgstr "Da li PismonoÅa da sam uspostaviti vezu po pokretanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid "Camera device"
-msgstr "UreÄaj kamerice"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Da li PismonoÅa da se sam prijavi na postojeÄe naloge nakon pokretanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Camera position"
-msgstr "PoloÅaj kamerice"
+msgid "Empathy should auto-away when idle"
+msgstr "Da li PismonoÅa da preÄe u stanje automatskog odsustva u mirovanju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
+"Whether Empathy should go into away mode automatically if the user is idle."
 msgstr ""
-"Znak za dodavanje posle nadimka kada se koristi automatsko dovrÅavanje nadimka "
-"(tab) u grupnim Äaskanjima."
+"Da li PismonoÅa da automatski preÄe u stanje odsustva prilikom mirovanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:7
-msgid "Chat window theme"
-msgstr "Tema prozora za Äaskanje"
+msgid "Empathy default download folder"
+msgstr "PismonoÅina podrazumevana fascikla za preuzimanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Chat window theme variant"
-msgstr "Varijanta teme prozora za Äaskanje"
+msgid "The default folder to save file transfers in."
+msgstr "Podrazumevana fascikla za Äuvanje prenesenih datoteka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr ""
-"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. âsr, en, "
-"frâ)."
+msgid "Show offline contacts"
+msgstr "Prikazuje prijatelje van mreÅe"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Compact contact list"
-msgstr "Zbijeni spisak prijatelja"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Connection managers should be used"
-msgstr "Da li Äe biti koriÅÄen upravnik mreÅom"
+msgid "Show avatars"
+msgstr "Prikazuje slike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid "Contact list sort criterion"
-msgstr "Kriterijum za sortiranje prijatelja"
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru Äaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Default camera device to use in video calls, e.g. /dev/video0."
-msgstr ""
-"Osnovna video kamerica koja Äe biti koriÅÄena u video pozivima, npr. â/dev/"
-"video0â."
+msgid "Show protocols"
+msgstr "Prikazuje protokole"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Default directory to select an avatar image from"
-msgstr "Podrazumevana fascikla za izbor slike"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr ""
+"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru Äaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Disable popup notifications when away"
-msgstr "IskljuÄuje iskaÄuÄa obaveÅtenja kada smo odsutni"
+msgid "Show Balance in contact list"
+msgstr "Prikazuje gotovinu na spisku prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Disable sounds when away"
-msgstr "OnemoguÄava zvuke kada smo odsutni"
+msgid "Whether to show account balances in the contact list."
+msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Display incoming events in the status area"
-msgstr "Prikazuje dolazne dogaÄaje na liniji stanja"
+msgid "Compact contact list"
+msgstr "Zbijeni spisak prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid ""
-"Display incoming events in the status area. If false, present them to the "
-"user immediately."
-msgstr ""
-"Prikazuje dolazne dogaÄaje na liniji stanja. Ako nije postavljeno, odmah ih "
-"prikazuje korisniku."
+msgid "Whether to show the contact list in compact mode."
+msgstr "Da li da prikazuje spisak prijatelja u zbijenom reÅimu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Echo cancellation support"
-msgstr "PodrÅka za uklanjanje odjeka"
+msgid "Hide main window"
+msgstr "Sakriva glavni prozor"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy can publish the user's location"
-msgstr "Da li PismonoÅa sme da objavljuje lokaciju korisnika"
+msgid "Hide the main window."
+msgstr "Sakriva glavni prozor programa."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Da li PismonoÅa sme da koristi GPS da pogodi lokaciju"
+msgid "Default directory to select an avatar image from"
+msgstr "Podrazumevana fascikla za izbor slike"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Da li PismonoÅa sme da koristi mobilnu mreÅu da pogodi lokaciju"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "Poslednja fascikla iz koje je izabrana slika."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy can use the network to guess the location"
-msgstr "Da li PismonoÅa sme da koristi mreÅu da pogodi lokaciju"
+msgid "Open new chats in separate windows"
+msgstr "Otvara nova Äaskanja u razliÄitim prozorima"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Empathy default download folder"
-msgstr "PismonoÅina podrazumevana fascikla za preuzimanja"
+msgid "Always open a separate chat window for new chats."
+msgstr "Uvek otvara poseban prozor za nova Äaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Empathy has migrated butterfly logs"
-msgstr "PismonoÅa je prebacio dnevnike iz leptira"
+msgid "Display incoming events in the status area"
+msgstr "Prikazuje dolazne dogaÄaje na liniji stanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Empathy should auto-away when idle"
-msgstr "Da li PismonoÅa da preÄe u stanje automatskog odsustva u mirovanju"
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr ""
+"Prikazuje dolazne dogaÄaje na liniji stanja. Ako nije postavljeno, odmah ih "
+"prikazuje korisniku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:27
-msgid "Empathy should auto-connect on startup"
-msgstr "Da li PismonoÅa da sam uspostaviti vezu po pokretanju"
+msgid "The position for the chat window side pane"
+msgstr "PoloÅaj boÄne povrÅi prozora za Äaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Empathy should reduce the location's accuracy"
-msgstr "Da li PismonoÅa da umanji preciznost lokacije"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "SaÄuvan poloÅaj (u taÄkama) boÄne povrÅi prozora za Äaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr ""
-"Da li PismonoÅa da koristi sliku prijatelja kao ikonicu prozora za Äaskanje"
+msgid "Contact list sort criterion"
+msgstr "Kriterijum za sortiranje prijatelja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Enable WebKit Developer Tools"
-msgstr "OmoguÄava Veb kit razvojne alate"
+#| msgid ""
+#| "Which criterion to use when sorting the contact list. Default is to sort "
+#| "by the contact's name with the value \"name\". A value of \"state\" will "
+#| "sort the contact list by state."
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
+"koristi âstateâ (sortiranje po stanju prijatelja). Ako je vrednost ânameâ, "
+"sortiranje se vrÅi po imenu prijatelja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Enable popup notifications for new messages"
-msgstr "OmoguÄava iskaÄuÄa obaveÅtenja za nove poruke"
+msgid "Use notification sounds"
+msgstr "Koristi zvukove za obaveÅtenja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Enable spell checker"
-msgstr "OmoguÄava proveru pisanja"
+msgid "Whether to play a sound to notify of events."
+msgstr "Da li da pusti obaveÅtajni zvuk za dogaÄaje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:33
-msgid "Hide main window"
-msgstr "Sakriva glavni prozor"
+msgid "Disable sounds when away"
+msgstr "OnemoguÄava zvuke kada smo odsutni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Hide the main window."
-msgstr "Sakriva glavni prozor programa."
+msgid "Whether to play sound notifications when away or busy."
+msgstr "Da li da pusti obaveÅtajni zvuk kada postanete zauzeti ili odsutni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Nick completed character"
-msgstr "Znak za dovrÅavanje nadimka"
+msgid "Play a sound for incoming messages"
+msgstr "PuÅta zvuk za dolazeÄe poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Open new chats in separate windows"
-msgstr "Otvara nova Äaskanja u razliÄitim prozorima"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "Da li da pusti obaveÅtajni zvuk kada vam stigne poruka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Path of the Adium theme to use"
-msgstr "Putanja do Adijum teme za koriÅÄenje"
+msgid "Play a sound for outgoing messages"
+msgstr "PuÅta zvuk za odlazeÄe poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr ""
-"Putanja do Adijum teme za koriÅÄenje, ako se koristi Adijum tema za Äaskanje."
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "Da li da pusti obaveÅtajni zvuk kada poÅaljete poruku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound for incoming messages"
-msgstr "PuÅta zvuk za dolazeÄe poruke"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Play a sound for new conversations"
 msgstr "PuÅta zvuk za nove razgovore"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Play a sound for outgoing messages"
-msgstr "PuÅta zvuk za odlazeÄe poruke"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "Da li da pusti obaveÅtajni zvuk na novi razgovor."
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound when a contact logs in"
 msgstr "PuÅta zvuk kada se prijatelj prijavi"
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "Da li da pusti obaveÅtajni zvuk kada se prijatelji prijave na mreÅu."
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Play a sound when a contact logs out"
 msgstr "PuÅta zvuk kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Play a sound when we log in"
-msgstr "PuÅta zvuk kada se ja prijavim"
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "Da li da pusti obaveÅtajni zvuk kada se prijatelji odjave sa mreÅe."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Play a sound when we log out"
-msgstr "PuÅta zvuk kada se ja odjavim"
+msgid "Play a sound when we log in"
+msgstr "PuÅta zvuk kada se ja prijavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "Ispisuje obaveÅtenja ako Äaskanje nije u fokusu"
+msgid "Whether to play a sound when logging into a network."
+msgstr "Da li da pusti zvuk kada se prijavite na mreÅu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:47
-msgid "Pop up notifications when a contact logs in"
-msgstr "Ispisuje obaveÅtenja kada se prijatelj prijavi"
+msgid "Play a sound when we log out"
+msgstr "PuÅta zvuk kada se ja odjavim"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Pop up notifications when a contact logs out"
-msgstr "Ispisuje obaveÅtenja kada se prijatelj odjavi"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "Da li da pusti zvuk kada se odjavite sa mreÅe."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "Position the camera preview should be during a call."
-msgstr "PoloÅaj prikaza kamerice za vreme poziva."
+msgid "Enable popup notifications for new messages"
+msgstr "OmoguÄava iskaÄuÄa obaveÅtenja za nove poruke"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "Show Balance in contact list"
-msgstr "Prikazuje gotovinu na spisku prijatelja"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "Da li da prikazuje oblaÄiÄ obaveÅtenja kada primite novu poruku."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "Show avatars"
-msgstr "Prikazuje slike"
+msgid "Disable popup notifications when away"
+msgstr "IskljuÄuje iskaÄuÄa obaveÅtenja kada smo odsutni"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "Show contact list in rooms"
-msgstr "Prikazuje spisak prijatelja u sobama"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "Da li da prikazuje oblaÄiÄ obaveÅtenja kada ste zauzeti ili odsutni."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "Show hint about closing the main window"
-msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "Ispisuje obaveÅtenja ako Äaskanje nije u fokusu"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Show offline contacts"
-msgstr "Prikazuje prijatelje van mreÅe"
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr ""
+"Da li da prikazuje oblaÄiÄ obaveÅtenja sa pristiglim porukama Äak i kada je "
+"prozor za Äaskanje otvoren, ali nije u fokusu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Show protocols"
-msgstr "Prikazuje protokole"
+msgid "Pop up notifications when a contact logs in"
+msgstr "Ispisuje obaveÅtenja kada se prijatelj prijavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Spell checking languages"
-msgstr "Jezici za proveru pisanja"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr ""
+"Da li da prikazuje oblaÄiÄ obaveÅtenja kada se prijatelj prijavi na mreÅu."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:57
-msgid "The default folder to save file transfers in."
-msgstr "Podrazumevana fascikla za Äuvanje prenesenih datoteka."
+msgid "Pop up notifications when a contact logs out"
+msgstr "Ispisuje obaveÅtenja kada se prijatelj odjavi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "The last directory that an avatar image was chosen from."
-msgstr "Poslednja fascikla iz koje je izabrana slika."
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr ""
+"Da li da prikazuje oblaÄiÄ obaveÅtenja kada se prijatelj odjavi sa mreÅe."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "The position for the chat window side pane"
-msgstr "PoloÅaj boÄne povrÅi prozora za Äaskanje"
+msgid "Use graphical smileys"
+msgstr "Prikazuje sliÄicu sa smeÅkom"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "SaÄuvan poloÅaj (u taÄkama) boÄne povrÅi prozora za Äaskanje."
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "Da li da prikazuje smeÅke kao sliÄice unutar razgovora."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "Tema za prikaz razgovora u prozoru Äaskanja."
+msgid "Show contact list in rooms"
+msgstr "Prikazuje spisak prijatelja u sobama"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid ""
-"The theme variant that is used to display the conversation in chat windows."
-msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru Äaskanja."
+msgid "Whether to show the contact list in chat rooms."
+msgstr "Da li da prikazuje spisak prijatelja u sobama za Äaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Use graphical smileys"
-msgstr "Prikazuje sliÄicu sa smeÅkom"
+msgid "Chat window theme"
+msgstr "Tema prozora za Äaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Use notification sounds"
-msgstr "Koristi zvukove za obaveÅtenja"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "Tema za prikaz razgovora u prozoru Äaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid "Use theme for chat rooms"
-msgstr "Koristi teme za sobe Äaskanja"
+msgid "Chat window theme variant"
+msgstr "Varijanta teme prozora za Äaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "Da li PismonoÅa da objavljuje lokaciju korisnika njegovim prijateljima."
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "Varijanta teme koja se koristi za prikaz razgovora u prozoru Äaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "Da li PismonoÅa sme da koristi GPS da pogodi lokaciju."
+msgid "Path of the Adium theme to use"
+msgstr "Putanja do Adijum teme za koriÅÄenje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "Da li PismonoÅa sme da koristi mobilnu mreÅu da pogodi lokaciju."
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr ""
+"Putanja do Adijum teme za koriÅÄenje, ako se koristi Adijum tema za Äaskanje."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "Da li PismonoÅa sme da koristi mreÅu da pogodi lokaciju."
+msgid "Enable WebKit Developer Tools"
+msgstr "OmoguÄava Veb kit razvojne alate"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Da li je PismonoÅa prebacio dnevnike iz leptira."
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+"Da li Äe biti omoguÄeni Veb kit razvojni alati, kao Åto je Veb Inspektor."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Da li PismonoÅa da se sam prijavi na postojeÄe naloge nakon pokretanja."
+msgid "Use theme for chat rooms"
+msgstr "Koristi teme za sobe Äaskanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
-msgid ""
-"Whether Empathy should go into away mode automatically if the user is idle."
-msgstr ""
-"Da li PismonoÅa da automatski preÄe u stanje odsustva prilikom mirovanja."
+msgid "Whether to use the theme for chat rooms."
+msgstr "Da li da koristi temu za sobe razgovora."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:73
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr ""
-"Da li PismonoÅa da umanji preciznost lokacije zbog poveÄane privatnosti."
+msgid "Spell checking languages"
+msgstr "Jezici za proveru pisanja"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr ""
-"Da li PismonoÅa da koristi sliku prijatelja kao ikonu u prozoru Äaskanja."
+"Spisak jezika odvojen zarezima koje koristi provera pravopisa (npr. âsr, en, "
+"frâ)."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-"Da li Äe biti omoguÄeni Veb kit razvojni alati, kao Åto je Veb Inspektor."
+msgid "Enable spell checker"
+msgstr "OmoguÄava proveru pisanja"
 
-# Nije connect veÄ disconnect!!! ~MiloÅ
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr ""
-"Da li treba koristiti upravnika mreÅe za automatsko prekidanje i ponovno "
-"uspostavljanje veze."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "Da li da proverava pisanje reÄi za izabrane jezike."
 
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Nick completed character"
+msgstr "Znak za dovrÅavanje nadimka"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "Da li da prikazuje smeÅke kao sliÄice unutar razgovora."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak za dodavanje posle nadimka kada se koristi automatsko dovrÅavanje nadimka "
+"(tab) u grupnim Äaskanjima."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:79
-msgid "Whether to enable Pulseaudio's echo cancellation filter."
-msgstr "Da li Äe biti ukljuÄen filter Pulse audia za uklanjanje odjeka."
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+"Da li PismonoÅa da koristi sliku prijatelja kao ikonicu prozora za Äaskanje"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "Da li da pusti obaveÅtajni zvuk kada se prijatelji prijave na mreÅu."
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr ""
+"Da li PismonoÅa da koristi sliku prijatelja kao ikonu u prozoru Äaskanja."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "Da li da pusti obaveÅtajni zvuk kada se prijatelji odjave sa mreÅe."
+msgid "Last account selected in Join Room dialog"
+msgstr "Poslednji izabrani nalog u prozorÄetu za pridruÅivanje sobi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
-msgid "Whether to play a sound to notify of events."
-msgstr "Da li da pusti obaveÅtajni zvuk za dogaÄaje."
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "Putanja objekta D-basa poslednjeg naloga izabranog za pridruÅivanje sobi"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "Da li da pusti obaveÅtajni zvuk kada vam stigne poruka."
+msgid "Camera device"
+msgstr "UreÄaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:84
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "Da li da pusti obaveÅtajni zvuk na novi razgovor."
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr ""
+"Osnovna video kamerica koja Äe biti koriÅÄena u video pozivima, npr. â/dev/"
+"video0â."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "Da li da pusti obaveÅtajni zvuk kada poÅaljete poruku."
+msgid "Camera position"
+msgstr "PoloÅaj kamerice"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to play a sound when logging into a network."
-msgstr "Da li da pusti zvuk kada se prijavite na mreÅu."
+msgid "Position the camera preview should be during a call."
+msgstr "PoloÅaj prikaza kamerice za vreme poziva."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:87
-msgid "Whether to play a sound when logging out of a network."
-msgstr "Da li da pusti zvuk kada se odjavite sa mreÅe."
+msgid "Echo cancellation support"
+msgstr "PodrÅka za uklanjanje odjeka"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to play sound notifications when away or busy."
-msgstr "Da li da pusti obaveÅtajni zvuk kada postanete zauzeti ili odsutni."
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "Da li Äe biti ukljuÄen filter Pulse audia za uklanjanje odjeka."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:89
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr ""
-"Da li da prikazuje oblaÄiÄ obaveÅtenja kada se prijatelj odjavi sa mreÅe."
+msgid "Show hint about closing the main window"
+msgstr "Prikazuje savet u vezi zatvaranja glavnog prozora"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid "Whether to show a popup notification when a contact goes online."
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
 msgstr ""
-"Da li da prikazuje oblaÄiÄ obaveÅtenja kada se prijatelj prijavi na mreÅu."
+"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
+"âxâ dugme."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr ""
-"Da li da prikazuje oblaÄiÄ obaveÅtenja sa pristiglim porukama Äak i kada je "
-"prozor za Äaskanje otvoren, ali nije u fokusu."
+msgid "Empathy can publish the user's location"
+msgstr "Da li PismonoÅa sme da objavljuje lokaciju korisnika"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "Da li da prikazuje oblaÄiÄ obaveÅtenja kada primite novu poruku."
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Da li PismonoÅa da objavljuje lokaciju korisnika njegovim prijateljima."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:93
-msgid "Whether to show account balances in the contact list."
-msgstr "Da li da prikazuje iznos gotovine naloga u spisku prijatelja."
+msgid "Empathy can use the network to guess the location"
+msgstr "Da li PismonoÅa sme da koristi mreÅu da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:94
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru Äaskanja."
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Da li PismonoÅa sme da koristi mreÅu da pogodi lokaciju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:95
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "Da li da prikazuje nepovezane prijatelje u spisku prijatelja."
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Da li PismonoÅa sme da koristi mobilnu mreÅu da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:96
-msgid "Whether to show popup notifications when away or busy."
-msgstr "Da li da prikazuje oblaÄiÄ obaveÅtenja kada ste zauzeti ili odsutni."
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Da li PismonoÅa sme da koristi mobilnu mreÅu da pogodi lokaciju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr ""
-"Da li da prikazuje slike za prijatelje u spisku prijatelja i prozoru Äaskanja."
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Da li PismonoÅa sme da koristi GPS da pogodi lokaciju"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether to show the contact list in chat rooms."
-msgstr "Da li da prikazuje spisak prijatelja u sobama za Äaskanje."
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Da li PismonoÅa sme da koristi GPS da pogodi lokaciju."
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Whether to show the contact list in compact mode."
-msgstr "Da li da prikazuje spisak prijatelja u zbijenom reÅimu."
+msgid "Empathy should reduce the location's accuracy"
+msgstr "Da li PismonoÅa da umanji preciznost lokacije"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:100
 msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr ""
-"Da li da prikazuje poruku o zatvaranju glavnog prozora kada ga zatvorite na "
-"âxâ dugme."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Whether to use the theme for chat rooms."
-msgstr "Da li da koristi temu za sobe razgovora."
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr ""
-"Koji kriterijum se koristi za sortiranje spiska prijatelja. Podrazumevano se "
-"koristi ânameâ (sortiranje po imenu prijatelja). Ako je vrednost âstateâ, "
-"sortiranje se vrÅi po stanju prijatelja."
+"Da li PismonoÅa da umanji preciznost lokacije zbog poveÄane privatnosti."
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2327
+msgid "Messaging and VoIP Accounts"
+msgstr "Nalozi za dopisivanje i VoIP"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
 msgid "Manage Messaging and VoIP accounts"
 msgstr "Upravljajte nalozima za dopisivanje i VoIP"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2324
-msgid "Messaging and VoIP Accounts"
-msgstr "Nalozi za dopisivanje i VoIP"
+#: ../libempathy/empathy-ft-handler.c:736
+msgid "No reason was specified"
+msgstr "Nije naveden razlog"
+
+#: ../libempathy/empathy-ft-handler.c:739
+msgid "The change in state was requested"
+msgstr "Zahtevana je promena stanja"
+
+#: ../libempathy/empathy-ft-handler.c:742
+msgid "You canceled the file transfer"
+msgstr "Obustavili ste prenos datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:745
+msgid "The other participant canceled the file transfer"
+msgstr "Druga strana je prekinula prenos datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:748
+msgid "Error while trying to transfer the file"
+msgstr "GreÅka prilikom prenosa datoteke"
+
+#: ../libempathy/empathy-ft-handler.c:751
+msgid "The other participant is unable to transfer the file"
+msgstr "Druga strana nije u moguÄnosti da prenese datoteku"
 
-#: ../libempathy/empathy-ft-handler.c:825
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+msgid "Unknown reason"
+msgstr "Nepoznat razlog"
+
+#: ../libempathy/empathy-ft-handler.c:917
 msgid "File transfer completed, but the file was corrupted"
 msgstr "Prenos datoteke je zavrÅen, ali je datoteka oÅteÄena"
 
-#: ../libempathy/empathy-ft-handler.c:1111
+#: ../libempathy/empathy-ft-handler.c:1203
 msgid "File transfer not supported by remote contact"
 msgstr "Druga strana ne podrÅava prenos datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1167
+#: ../libempathy/empathy-ft-handler.c:1259
 msgid "The selected file is not a regular file"
 msgstr "Izabrana datoteka nije obiÄna datoteka"
 
-#: ../libempathy/empathy-ft-handler.c:1176
+#: ../libempathy/empathy-ft-handler.c:1268
 msgid "The selected file is empty"
 msgstr "Izabrana datoteka je prazna"
 
@@ -548,169 +571,139 @@ msgstr "Poziv korisnika %s"
 msgid "Call from %s"
 msgstr "Poziv od %s"
 
-#: ../libempathy/empathy-tp-file.c:268
-msgid "Socket type not supported"
-msgstr "Vrsta prikljuÄka nije podrÅana"
-
-#: ../libempathy/empathy-tp-file.c:387
-msgid "No reason was specified"
-msgstr "Nije naveden razlog"
-
-#: ../libempathy/empathy-tp-file.c:390
-msgid "The change in state was requested"
-msgstr "Zahtevana je promena stanja"
-
-#: ../libempathy/empathy-tp-file.c:393
-msgid "You canceled the file transfer"
-msgstr "Obustavili ste prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:396
-msgid "The other participant canceled the file transfer"
-msgstr "Druga strana je prekinula prenos datoteke"
-
-#: ../libempathy/empathy-tp-file.c:399
-msgid "Error while trying to transfer the file"
-msgstr "GreÅka prilikom prenosa datoteke"
-
-#: ../libempathy/empathy-tp-file.c:402
-msgid "The other participant is unable to transfer the file"
-msgstr "Druga strana nije u moguÄnosti da prenese datoteku"
-
-#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:312
-msgid "Unknown reason"
-msgstr "Nepoznat razlog"
-
-#: ../libempathy/empathy-utils.c:232
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../libempathy/empathy-utils.c:234
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../libempathy/empathy-utils.c:239
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../libempathy/empathy-utils.c:241
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "Nepovezan"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:245
 msgctxt "presence"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../libempathy/empathy-utils.c:284
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "Nije naveden razlog"
 
-#: ../libempathy/empathy-utils.c:286 ../libempathy/empathy-utils.c:342
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "Stanje je postavljeno na ânepovezanâ"
 
-#: ../libempathy/empathy-utils.c:288 ../libempathy/empathy-utils.c:322
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
 #: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "GreÅka u mreÅi"
 
-#: ../libempathy/empathy-utils.c:290 ../libempathy/empathy-utils.c:324
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "NeuspeÅna prijava"
 
-#: ../libempathy/empathy-utils.c:292 ../libempathy/empathy-utils.c:326
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "GreÅka pri Åifrovanju"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
 msgstr "Ime je u upotrebi"
 
-#: ../libempathy/empathy-utils.c:296 ../libempathy/empathy-utils.c:328
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "Sertifikat nije prosleÄen"
 
-#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:330
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "Sertifikat nije od poverenja"
 
-#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:332
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "Sertifikat je istekao"
 
-#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:334
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "Sertifikat nije aktiviran"
 
-#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:336
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "Ime domaÄina sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:306 ../libempathy/empathy-utils.c:338
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "Otisak sertifikata se ne poklapa"
 
-#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "Sertifikat je samopotpisan"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "GreÅka u sertifikatu"
 
-#: ../libempathy/empathy-utils.c:344
+#: ../libempathy/empathy-utils.c:345
 msgid "Encryption is not available"
 msgstr "Åifrovanje nije dostupno"
 
-#: ../libempathy/empathy-utils.c:346
+#: ../libempathy/empathy-utils.c:347
 msgid "Certificate is invalid"
 msgstr "Sertifikat nije ispravan"
 
-#: ../libempathy/empathy-utils.c:348
+#: ../libempathy/empathy-utils.c:349
 msgid "Connection has been refused"
 msgstr "Veza je odbijena"
 
-#: ../libempathy/empathy-utils.c:350
+#: ../libempathy/empathy-utils.c:351
 msgid "Connection can't be established"
 msgstr "Veza ne moÅe da se uspostavi"
 
-#: ../libempathy/empathy-utils.c:352
+#: ../libempathy/empathy-utils.c:353
 msgid "Connection has been lost"
 msgstr "Veza je izgubljena"
 
-#: ../libempathy/empathy-utils.c:354
-msgid "This resource is already connected to the server"
-msgstr "Ovaj resurs je veÄ povezan sa serverom"
+#: ../libempathy/empathy-utils.c:355
+#| msgid "This resource is already connected to the server"
+msgid "This account is already connected to the server"
+msgstr "Ovaj nalog je veÄ povezan sa serverom"
 
-#: ../libempathy/empathy-utils.c:356
+#: ../libempathy/empathy-utils.c:357
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "Veza je zamenjena novom vezom koristeÄi isti resurs"
 
-#: ../libempathy/empathy-utils.c:359
+#: ../libempathy/empathy-utils.c:360
 msgid "The account already exists on the server"
 msgstr "Ovaj nalog veÄ postoji na serveru"
 
-#: ../libempathy/empathy-utils.c:361
+#: ../libempathy/empathy-utils.c:362
 msgid "Server is currently too busy to handle the connection"
 msgstr "Server je trenutno previÅe zauzet da bi uspostavio vezu"
 
-#: ../libempathy/empathy-utils.c:363
+#: ../libempathy/empathy-utils.c:364
 msgid "Certificate has been revoked"
 msgstr "Sertifikat je opozvan"
 
-#: ../libempathy/empathy-utils.c:365
+#: ../libempathy/empathy-utils.c:366
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr ""
 "Sertifikat koristi nebezbedni algoritam Åifrovanja ili je kriptografski slab"
 
-#: ../libempathy/empathy-utils.c:368
+#: ../libempathy/empathy-utils.c:369
 msgid ""
 "The length of the server certificate, or the depth of the server certificate "
 "chain, exceed the limits imposed by the cryptography library"
@@ -718,24 +711,32 @@ msgstr ""
 "DuÅina sertifikata servera, ili dubina lanca sertifikata servera premaÅuje "
 "granice biblioteke za Åifrovanje"
 
-#: ../libempathy/empathy-utils.c:529
-#: ../libempathy-gtk/empathy-contact-list-store.h:73
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "VaÅ softver je previÅe star"
+
+#: ../libempathy/empathy-utils.c:375
+#| msgid "Interval (seconds)"
+msgid "Internal error"
+msgstr "UnutraÅnja greÅka"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "Ljudi u okolini"
 
-#: ../libempathy/empathy-utils.c:534
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Jahu! Japan"
 
-#: ../libempathy/empathy-utils.c:563
+#: ../libempathy/empathy-utils.c:568
 msgid "Google Talk"
 msgstr "Gugl razgovor"
 
-#: ../libempathy/empathy-utils.c:564
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Fejsbuk Äaskanje"
 
-#: ../libempathy/empathy-time.c:88
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
@@ -744,7 +745,7 @@ msgstr[1] "Pre %d sekunde"
 msgstr[2] "Pre %d sekundi"
 msgstr[3] "Pre jedne sekunde"
 
-#: ../libempathy/empathy-time.c:93
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
@@ -753,7 +754,7 @@ msgstr[1] "Pre %d minuta"
 msgstr[2] "Pre %d minuta"
 msgstr[3] "Pre jednog minuta"
 
-#: ../libempathy/empathy-time.c:98
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
@@ -762,7 +763,7 @@ msgstr[1] "Pre %d sata"
 msgstr[2] "Pre %d sati"
 msgstr[3] "Pre jednog sata"
 
-#: ../libempathy/empathy-time.c:103
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
@@ -771,7 +772,7 @@ msgstr[1] "Pre %d dana"
 msgstr[2] "Pre %d dana"
 msgstr[3] "Pre jednog dana"
 
-#: ../libempathy/empathy-time.c:108
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
@@ -780,7 +781,7 @@ msgstr[1] "Pre %d nedelje"
 msgstr[2] "Pre %d nedelja"
 msgstr[3] "Pre jedne nedelje"
 
-#: ../libempathy/empathy-time.c:113
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
@@ -789,224 +790,196 @@ msgstr[1] "Pre %d meseca"
 msgstr[2] "Pre %d meseci"
 msgstr[3] "Pre jednog meseca"
 
-#: ../libempathy/empathy-time.c:136
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "u buduÄnosti"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:540
+#: ../libempathy-gtk/empathy-account-chooser.c:692
 msgid "All accounts"
 msgstr "Svi nalozi"
 
-#: ../libempathy-gtk/empathy-account-widget.c:694
-#: ../src/empathy-import-widget.c:321
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
 msgid "Account"
 msgstr "Nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:695
+#: ../libempathy-gtk/empathy-account-widget.c:683
 msgid "Password"
 msgstr "Lozinka"
 
-#: ../libempathy-gtk/empathy-account-widget.c:696
+#: ../libempathy-gtk/empathy-account-widget.c:684
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:507
 msgid "Server"
 msgstr "Server"
 
-#: ../libempathy-gtk/empathy-account-widget.c:697
+#: ../libempathy-gtk/empathy-account-widget.c:685
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:522
 msgid "Port"
 msgstr "Port"
 
-#: ../libempathy-gtk/empathy-account-widget.c:769
-#: ../libempathy-gtk/empathy-account-widget.c:826
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1192
-msgid "My Web Accounts"
-msgstr "Moji veb nalozi"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1208
-#, c-format
-msgid "The account %s is edited via %s."
-msgstr "Nalog %s je izmenjen putem %s."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1214
-#, c-format
-msgid "The account %s cannot be edited in Empathy."
-msgstr "Nalog %s ne moÅe biti ureÄivan iz PismonoÅe."
-
-#: ../libempathy-gtk/empathy-account-widget.c:1233
-msgid "Launch My Web Accounts"
-msgstr "Pokreni Moje veb naloge"
-
-#. general handler
-#: ../libempathy-gtk/empathy-account-widget.c:1241
-#, c-format
-msgid "Edit %s"
-msgstr "Izmeni %s"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1591
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Username:"
 msgstr "KorisniÄko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1909
+#: ../libempathy-gtk/empathy-account-widget.c:1710
 msgid "A_pply"
 msgstr "_Primeni"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1939
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
 msgstr "Prijavi _me"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
 msgstr "Ovaj nalog veÄ postoji na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2016
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
 msgstr "Napravi novi nalog na serveru"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2208
-msgid "Ca_ncel"
-msgstr "Po_niÅti"
-
 #. To translators: The first parameter is the login id and the
 #. * second one is the network. The resulting string will be something
 #. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:2486
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%1$s na %2$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2512
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
 msgstr "%s nalog"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2516
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
 msgstr "Novi nalog"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>Primer:</b> MojNadimak"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "_Lozinka:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "Napredno"
+msgid "Screen _Name:"
+msgstr "_Nadimak:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>Primer:</b> MojNadimak"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "Pass_word:"
-msgstr "_Lozinka:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Remember Password"
-msgstr "Zapamti lozinku"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "_Port:"
 
-#. remember password ticky box
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-#: ../libempathy-gtk/empathy-password-dialog.c:311
-msgid "Remember password"
-msgstr "Zapamti lozinku"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "Screen _Name:"
-msgstr "_Nadimak:"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "_Server:"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-msgid "What is your AIM password?"
-msgstr "Koja je vaÅa AIM lozinka?"
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "Napredno"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
 msgstr "Koji je vaÅ AIM nadimak?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "_Port:"
+msgid "What is your AIM password?"
+msgstr "Koja je vaÅa AIM lozinka?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "_Server:"
-
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>Primer:</b> korisniÄko_ime"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "Zapamti lozinku"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "_KorisniÄko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>Primer:</b> korisniÄko_ime"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "Koji je vaÅ Group Vajz korisniÄki IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "Koja je vaÅa Group Vajz lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+msgid "ICQ _UIN:"
+msgstr "ICKu _KIB:"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "<b>Example:</b> 123456789"
 msgstr "<b>Primer:</b> 123456789"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "Ch_aracter set:"
 msgstr "Kodni r_aspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-msgid "ICQ _UIN:"
-msgstr "ICKu _KIB:"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "Koji je vaÅ ICKu KIB?"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "Koja je vaÅa ICKu lozinka?"
 
@@ -1043,11 +1016,23 @@ msgstr "Opcije"
 msgid "None"
 msgstr "NiÅta"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
+msgid "Network"
+msgstr "MreÅa"
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+msgid "Network:"
+msgstr "MreÅa:"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Character set:"
 msgstr "Kodni raspored:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+msgid "Servers"
+msgstr "Serveri"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid ""
 "Most IRC servers don't need a password, so if you're not sure, don't enter a "
 "password."
@@ -1055,14 +1040,6 @@ msgstr ""
 "VeÄina IRC servera ne traÅi lozinku, zato ako niste sigurni, nemojte je "
 "unositi."
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
-msgid "Network"
-msgstr "MreÅa"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-msgid "Network:"
-msgstr "MreÅa:"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Nickname:"
 msgstr "Nadimak:"
@@ -1079,48 +1056,20 @@ msgstr "Poruka za kraj:"
 msgid "Real name:"
 msgstr "Pravo ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-msgid "Servers"
-msgstr "Serveri"
-
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "What is your IRC nickname?"
-msgstr "Koji je vaÅ IRC nadimak?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Which IRC network?"
 msgstr "Koja IRC mreÅa?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user gmail com"
-msgstr "<b>Primer:</b> korisnik gmail com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user jabber org"
-msgstr "<b>Primer:</b> korisnik jabber org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "Zahteva se _Åifrovanje(TLS/SSL)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "I_gnore SSL certificate errors"
-msgstr "_Zanemari greÅke SSL sertifikata"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Override server settings"
-msgstr "PrevaziÄi postavke servera"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Priori_ty:"
-msgstr "_Prioritet:"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
+msgid "What is your IRC nickname?"
+msgstr "Koji je vaÅ IRC nadimak?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "Reso_urce:"
-msgstr "_Resurs:"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "Koje je vaÅe Fejsbuk korisniÄko ime?"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -1132,179 +1081,203 @@ msgstr ""
 "Ukoliko nemate korisniÄko ime za Fejsbuk, idite na <a href=\"http://www.";
 "facebook.com/username/\">ovu stranu</a> da ga izaberete."
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Use old SS_L"
-msgstr "Koristi stari SS_L"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "What is your Facebook password?"
 msgstr "Koja je vaÅa Fejsbuk lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Facebook username?"
-msgstr "Koje je vaÅe Fejsbuk korisniÄko ime?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "What is your Google ID?"
 msgstr "Koji je vaÅ Gugl IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>Primer:</b> korisnik gmail com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "What is your Google password?"
 msgstr "Koja je vaÅa Gugl lozinka?"
 
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>Primer:</b> korisnik jabber org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+msgid "I_gnore SSL certificate errors"
+msgstr "_Zanemari greÅke SSL sertifikata"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "Priori_ty:"
+msgstr "_Prioritet:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "Reso_urce:"
+msgstr "_Resurs:"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "Zahteva se _Åifrovanje(TLS/SSL)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "Koristi stari SS_L"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "PrevaziÄi postavke servera"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your Jabber ID?"
 msgstr "Koji je vaÅ DÅaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "What is your Jabber password?"
-msgstr "Koja je vaÅa DÅaber lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber ID?"
 msgstr "Koji je vaÅ Åeljeni DÅaber IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "Koja je vaÅa DÅaber lozinka?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
 msgid "What is your desired Jabber password?"
 msgstr "Koja ja vaÅa Åeljena DÅaber lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "<b>Example:</b> user hotmail com"
 msgstr "<b>Primer:</b> korisnik hotmail com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
 msgstr "Koji je vaÅ Vindouz UÅivo IB ?"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-msgid "What is your Windows Live password?"
-msgstr "Koja je vaÅa Vindouz UÅivo lozinka?"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "E-_mail address:"
-msgstr "Adresa _e-poÅte:"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
+msgid "What is your Windows Live password?"
+msgstr "Koja je vaÅa Vindouz UÅivo lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
 msgid "Nic_kname:"
 msgstr "_Nadimak:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "_Last Name:"
+msgstr "_Prezime:"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "_Ime:"
 
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+msgid "_Published Name:"
+msgstr "Ime za _objavu:"
+
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_DÅaber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Last Name:"
-msgstr "_Prezime:"
+msgid "E-_mail address:"
+msgstr "Adresa _e-poÅte:"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "Ime za _objavu:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "_KorisniÄko ime:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "<b>Example:</b> user my sip server"
 msgstr "<b>Primer:</b> korisnik moj sip server"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Authentication username:"
-msgstr "KorisniÄko ime za prijavu:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "Otkrij povezivanja"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "Automatski otkrij STUN server"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Ignore TLS Errors"
-msgstr "Zanemari TLS greÅke"
+msgid "NAT Traversal Options"
+msgstr "Opcije prolaska kroz NAT"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Interval (seconds)"
-msgstr "Period (u sekundama)"
+msgid "Proxy Options"
+msgstr "Opcije posrednika"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Keep-Alive Options"
-msgstr "Opcije za odrÅavanje stalne veze"
+msgid "Miscellaneous Options"
+msgstr "Razne opcije"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Loose Routing"
-msgstr "Slabo rutiranje"
+msgid "STUN Server:"
+msgstr "STUN server:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Mechanism:"
-msgstr "Mehanizam:"
+msgid "Discover the STUN server automatically"
+msgstr "Automatski otkrij STUN server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Miscellaneous Options"
-msgstr "Razne opcije"
+msgid "Discover Binding"
+msgstr "Otkrij povezivanja"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-msgid "NAT Traversal Options"
-msgstr "Opcije prolaska kroz NAT"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "Server:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Opcije za odrÅavanje stalne veze"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Port:"
-msgstr "Port:"
+msgid "Mechanism:"
+msgstr "Mehanizam:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Proxy Options"
-msgstr "Opcije posrednika"
+msgid "Interval (seconds)"
+msgstr "Period (u sekundama)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "KorisniÄko ime za prijavu:"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "Transport:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
-msgid "STUN Server:"
-msgstr "STUN server:"
+msgid "Loose Routing"
+msgstr "Slabo rutiranje"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-#: ../libempathy-gtk/empathy-contact-widget.c:347
-msgid "Server:"
-msgstr "Server:"
+msgid "Ignore TLS Errors"
+msgstr "Zanemari TLS greÅke"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "Transport:"
-msgstr "Transport:"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
-msgid "Use this account to call _landlines and mobile phones"
-msgstr "Koristi ovaj nalog za pozive _linijskih i mobilnih telefona"
+msgid "Port:"
+msgstr "Port:"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
-msgid "What is your SIP account password?"
-msgstr "Koja je lozinka za vaÅ SIP nalog?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
 msgid "What is your SIP login ID?"
 msgstr "Koja je identifikacija za SIP prijavu?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid "_Username:"
-msgstr "_KorisniÄko ime:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "Koja je lozinka za vaÅ SIP nalog?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
+msgstr "Jahu! I_B:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "I_gnore conference and chat room invitations"
 msgstr "_Zanemari pozivnice za priÄaonice i konferencije"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+msgid "_Room List locale:"
+msgstr "Lok_alni spisak soba:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "What is your Yahoo! ID?"
 msgstr "Koji je vaÅ Jahu! IB?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "What is your Yahoo! password?"
 msgstr "Koja je vaÅa Jahu! lozinka?"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "Yahoo! I_D:"
-msgstr "Jahu! I_B:"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
-msgid "_Room List locale:"
-msgstr "Lok_alni spisak soba:"
-
 #: ../libempathy-gtk/empathy-avatar-chooser.c:471
 #: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
@@ -1343,7 +1316,7 @@ msgid "Click to enlarge"
 msgstr "Kliknite da uveÄate"
 
 #: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:62
 msgid "There was an error starting the call"
 msgstr "DoÅlo je do greÅke prilikom pozivanja"
 
@@ -1363,63 +1336,67 @@ msgstr "Navedeni kontakt nije ispravan"
 msgid "Emergency calls are not supported on this protocol"
 msgstr "Ovaj protokol ne podrÅava hitne pozive"
 
-#: ../libempathy-gtk/empathy-chat.c:704
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "Nemate dovoljno kredita da biste mogli da obavite ovaj poziv"
+
+#: ../libempathy-gtk/empathy-chat.c:710
 msgid "Failed to open private chat"
 msgstr "Nisam uspeo da otvorim privatno Äaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:765
+#: ../libempathy-gtk/empathy-chat.c:768
 msgid "Topic not supported on this conversation"
 msgstr "Teme nisu podrÅane u ovom razgovoru"
 
-#: ../libempathy-gtk/empathy-chat.c:771
+#: ../libempathy-gtk/empathy-chat.c:774
 msgid "You are not allowed to change the topic"
 msgstr "Nije vam dozvoljeno da promenite temu"
 
-#: ../libempathy-gtk/empathy-chat.c:975
+#: ../libempathy-gtk/empathy-chat.c:973
 #, c-format
 msgid "â%sâ is not a valid contact ID"
 msgstr "â%sâ nije ispravan IB kontakta"
 
-#: ../libempathy-gtk/empathy-chat.c:1060
+#: ../libempathy-gtk/empathy-chat.c:1068
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: Äisti sve poruke iz ovog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1063
+#: ../libempathy-gtk/empathy-chat.c:1071
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <tema>: postavlja temu trenutnog razgovora"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1074
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <IB sobe>: prikljuÄuje se novoj sobi za Äaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1069
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <IB sobe>: prikljuÄuje se novoj sobi za Äaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1073
+#: ../libempathy-gtk/empathy-chat.c:1081
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr ""
 "/part [<IB sobe>] [<razlog>]: napuÅta sobu za Äaskanje, podrazumevano trenutnu"
 
-#: ../libempathy-gtk/empathy-chat.c:1077
+#: ../libempathy-gtk/empathy-chat.c:1085
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <IB prijatelja> [<poruka>]: otvara privatno Äaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1080
+#: ../libempathy-gtk/empathy-chat.c:1088
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <IB prijatelja> <poruka>: otvara privatno Äaskanje"
 
-#: ../libempathy-gtk/empathy-chat.c:1083
+#: ../libempathy-gtk/empathy-chat.c:1091
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <nadimak>: menja vaÅ nadimak na trenutnom serveru"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <poruka>: Åalje poruku RADNJA na trenutni razgovor"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1429,11 +1406,11 @@ msgstr ""
 "poruka koje poÄinju sa â/â. Na primer: â/say /join se koristi za prikljuÄivanje "
 "u novu sobu za Äaskanjeâ"
 
-#: ../libempathy-gtk/empathy-chat.c:1094
+#: ../libempathy-gtk/empathy-chat.c:1102
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <IB kontakta>: prikazuje podatke o kontaktu"
 
-#: ../libempathy-gtk/empathy-chat.c:1097
+#: ../libempathy-gtk/empathy-chat.c:1105
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1441,113 +1418,128 @@ msgstr ""
 "/help [<komanda>]: prikazuje sve podrÅane naredbe. Ako se da i konkretna "
 "<naredba>, prikazuje njeno uputstvo za upotrebu."
 
-#: ../libempathy-gtk/empathy-chat.c:1114
+#: ../libempathy-gtk/empathy-chat.c:1124
 #, c-format
 msgid "Usage: %s"
 msgstr "KoriÅÄenje: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1159
+#: ../libempathy-gtk/empathy-chat.c:1169
 msgid "Unknown command"
 msgstr "Nepoznata naredba"
 
-#: ../libempathy-gtk/empathy-chat.c:1285
+#: ../libempathy-gtk/empathy-chat.c:1295
 msgid "Unknown command; see /help for the available commands"
 msgstr "Nepoznata naredba; pogledajte /help za dostupne naredbe"
 
-#. translators: error used when user doesn't have enough credit on his
-#. * account to send the message.
-#: ../libempathy-gtk/empathy-chat.c:1455
+#: ../libempathy-gtk/empathy-chat.c:1541
 msgid "insufficient balance to send message"
 msgstr "nema dovoljno gotovine za slanje poruke"
 
-#: ../libempathy-gtk/empathy-chat.c:1457
+#: ../libempathy-gtk/empathy-chat.c:1545 ../libempathy-gtk/empathy-chat.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1622
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "GreÅka pri slanju poruke â%sâ: %s"
+
+#: ../libempathy-gtk/empathy-chat.c:1547 ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1626
+#, c-format
+msgid "Error sending message: %s"
+msgstr "GreÅka pri slanju poruke: %s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1553
+#, c-format
+#| msgid "insufficient balance to send message"
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "nema dovoljno gotovine za slanje poruke. <a href='%s'>Dopunite</a>."
+
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "not capable"
 msgstr "nesposoban"
 
-#: ../libempathy-gtk/empathy-chat.c:1464
+#: ../libempathy-gtk/empathy-chat.c:1600
 msgid "offline"
 msgstr "nepovezan"
 
-#: ../libempathy-gtk/empathy-chat.c:1467
+#: ../libempathy-gtk/empathy-chat.c:1603
 msgid "invalid contact"
 msgstr "neispravan prijatelj"
 
-#: ../libempathy-gtk/empathy-chat.c:1470
+#: ../libempathy-gtk/empathy-chat.c:1606
 msgid "permission denied"
 msgstr "pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-chat.c:1473
+#: ../libempathy-gtk/empathy-chat.c:1609
 msgid "too long message"
 msgstr "poruka je preduga"
 
-#: ../libempathy-gtk/empathy-chat.c:1476
+#: ../libempathy-gtk/empathy-chat.c:1612
 msgid "not implemented"
 msgstr "nije podrÅano"
 
-#: ../libempathy-gtk/empathy-chat.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1616
 msgid "unknown"
 msgstr "nepoznato"
 
-#: ../libempathy-gtk/empathy-chat.c:1486
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "GreÅka pri slanju poruke â%sâ: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1490
-#, c-format
-msgid "Error sending message: %s"
-msgstr "GreÅka pri slanju poruke: %s"
-
-#: ../libempathy-gtk/empathy-chat.c:1551 ../src/empathy-chat-window.c:761
+#: ../libempathy-gtk/empathy-chat.c:1683 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "Tema:"
 
-#: ../libempathy-gtk/empathy-chat.c:1563
+#: ../libempathy-gtk/empathy-chat.c:1698
 #, c-format
 msgid "Topic set to: %s"
 msgstr "Tema je postavljena na: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1700
+#, c-format
+#| msgid "Topic set to: %s"
+msgid "Topic set by %s to: %s"
+msgstr "Temu je postavio %s na: %s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1705
 msgid "No topic defined"
 msgstr "Tema nije postavljena"
 
-#: ../libempathy-gtk/empathy-chat.c:2074
+#: ../libempathy-gtk/empathy-chat.c:2221
 msgid "(No Suggestions)"
 msgstr "(nema predloga)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2142
+#: ../libempathy-gtk/empathy-chat.c:2289
 #, c-format
 msgid "Add '%s' to Dictionary"
 msgstr "Dodaj â%sâ u reÄnik"
 
 #. translators: first %s is the selected word,
 #. * second %s is the language name of the target dictionary
-#: ../libempathy-gtk/empathy-chat.c:2179
+#: ../libempathy-gtk/empathy-chat.c:2326
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "Dodaj â%sâ u reÄnik za %s jezik"
 
-#: ../libempathy-gtk/empathy-chat.c:2249
+#: ../libempathy-gtk/empathy-chat.c:2396
 msgid "Insert Smiley"
 msgstr "Ubaci smeÅak"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2267
-#: ../libempathy-gtk/empathy-ui-utils.c:1839
+#: ../libempathy-gtk/empathy-chat.c:2414
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "_PoÅalji"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2321
+#: ../libempathy-gtk/empathy-chat.c:2471
 msgid "_Spelling Suggestions"
 msgstr "Predlozi pravopi_sa"
 
-#: ../libempathy-gtk/empathy-chat.c:2410
+#: ../libempathy-gtk/empathy-chat.c:2560
 msgid "Failed to retrieve recent logs"
 msgstr "Nisam uspeo da preuzmem skoraÅnje dnevnike"
 
-#: ../libempathy-gtk/empathy-chat.c:2547
+#: ../libempathy-gtk/empathy-chat.c:2699
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s je otiÅao sa veze"
@@ -1555,12 +1547,12 @@ msgstr "%s je otiÅao sa veze"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2554
+#: ../libempathy-gtk/empathy-chat.c:2706
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%2$s je izbacio korisnika %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2557
+#: ../libempathy-gtk/empathy-chat.c:2709
 #, c-format
 msgid "%s was kicked"
 msgstr "%s je izbaÄen"
@@ -1568,17 +1560,17 @@ msgstr "%s je izbaÄen"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2565
+#: ../libempathy-gtk/empathy-chat.c:2717
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%2$s je zabranio pristup korisniku %1$s"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:2720
 #, c-format
 msgid "%s was banned"
 msgstr "Korisniku %s je zabranjen pristup"
 
-#: ../libempathy-gtk/empathy-chat.c:2572
+#: ../libempathy-gtk/empathy-chat.c:2724
 #, c-format
 msgid "%s has left the room"
 msgstr "%s je napustio(la) priÄaonicu"
@@ -1588,17 +1580,17 @@ msgstr "%s je napustio(la) priÄaonicu"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2581
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2606
+#: ../libempathy-gtk/empathy-chat.c:2758
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s je pristupio(la) priÄaonici"
 
-#: ../libempathy-gtk/empathy-chat.c:2631
+#: ../libempathy-gtk/empathy-chat.c:2783
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s je sada poznat kao %s"
@@ -1606,90 +1598,90 @@ msgstr "%s je sada poznat kao %s"
 #. We don't know if the incoming call has been accepted or not, so we
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
-#: ../libempathy-gtk/empathy-chat.c:2784
-#: ../src/empathy-streamed-media-window.c:1894
-#: ../src/empathy-event-manager.c:1240 ../src/empathy-call-window.c:1432
-#: ../src/empathy-call-window.c:1482 ../src/empathy-call-window.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2970
+#: ../src/empathy-streamed-media-window.c:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1538
+#: ../src/empathy-call-window.c:1588 ../src/empathy-call-window.c:2631
 msgid "Disconnected"
 msgstr "Veza je prekinuta"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3428
+#: ../libempathy-gtk/empathy-chat.c:3634
 msgid "Would you like to store this password?"
 msgstr "Da li Åelite da zapamtite ovu lozinku?"
 
-#: ../libempathy-gtk/empathy-chat.c:3434
+#: ../libempathy-gtk/empathy-chat.c:3640
 msgid "Remember"
 msgstr "Zapamti"
 
-#: ../libempathy-gtk/empathy-chat.c:3444
+#: ../libempathy-gtk/empathy-chat.c:3650
 msgid "Not now"
 msgstr "Ne sada"
 
-#: ../libempathy-gtk/empathy-chat.c:3488
+#: ../libempathy-gtk/empathy-chat.c:3694
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "PokuÅaj ponovo"
 
-#: ../libempathy-gtk/empathy-chat.c:3492
+#: ../libempathy-gtk/empathy-chat.c:3698
 msgid "Wrong password; please try again:"
 msgstr "PogreÅna lozinka, pokuÅajte ponovo:"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3622
+#: ../libempathy-gtk/empathy-chat.c:3828
 msgid "This room is protected by a password:"
 msgstr "Ova soba je zaÅtiÄena lozinkom:"
 
-#: ../libempathy-gtk/empathy-chat.c:3649
+#: ../libempathy-gtk/empathy-chat.c:3855
 msgid "Join"
 msgstr "PrikljuÄi se"
 
-#: ../libempathy-gtk/empathy-chat.c:3851 ../src/empathy-event-manager.c:1261
+#: ../libempathy-gtk/empathy-chat.c:4047 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "Povezan"
 
-#: ../libempathy-gtk/empathy-chat.c:3906
+#: ../libempathy-gtk/empathy-chat.c:4102
 msgid "Conversation"
 msgstr "Razgovor"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:3911
+#: ../libempathy-gtk/empathy-chat.c:4107
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (SMS)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:424
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
 msgid "Unknown or invalid identifier"
 msgstr "Nepoznati ili neispravan identifikator"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:426
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
 msgid "Contact blocking temporarily unavailable"
 msgstr "Blokiranje prijatelja je trenutno nedostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:428
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
 msgid "Contact blocking unavailable"
 msgstr "Blokiranje prijatelja nije dostupno"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:430
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
 msgid "Permission Denied"
 msgstr "Pristup je zabranjen"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:434
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
 msgid "Could not block contact"
 msgstr "Ne mogu da blokiram prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:774
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
 msgid "Edit Blocked Contacts"
 msgstr "Izmeni blokirane prijatelje"
 
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:512
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1489
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Account:"
 msgstr "Nalog:"
 
@@ -1697,468 +1689,385 @@ msgstr "Nalog:"
 msgid "Blocked Contacts"
 msgstr "Blokirani prijatelji"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-#: ../src/empathy-accounts-dialog.ui.h:5
-#: ../src/empathy-chatrooms-window.ui.h:3
-msgid "Remove"
-msgstr "Ukloni"
-
-#. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:320
-#: ../libempathy-gtk/empathy-webkit-utils.c:277
-msgid "_Copy Link Address"
-msgstr "_UmnoÅi adresu veze"
-
-#. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:327
-#: ../libempathy-gtk/empathy-webkit-utils.c:284
-msgid "_Open Link"
-msgstr "_Otvori vezu"
-
-#. Translators: timestamp displayed between conversations in
-#. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:415
-msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:299
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
-msgid "Edit Contact Information"
-msgstr "Izmeni podatke kontakta"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:350
-msgid "Personal Information"
-msgstr "Podaci o profilu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:459
-#: ../libempathy-gtk/empathy-individual-dialogs.c:119
-msgid "New Contact"
-msgstr "Novi prijatelj"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:533
-#: ../libempathy-gtk/empathy-individual-dialogs.c:200
-#, c-format
-msgid "Block %s?"
-msgstr "Blokirati %s?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:538
-#: ../libempathy-gtk/empathy-individual-dialogs.c:255
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr ""
-"Da li ste sigurni da Åelite da blokirate da vas â%sâ viÅe ne kontaktira?"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:543
-#: ../libempathy-gtk/empathy-individual-dialogs.c:277
-msgid "_Block"
-msgstr "_Blokiraj"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:559
-#: ../libempathy-gtk/empathy-individual-dialogs.c:286
-msgid "_Report this contact as abusive"
-msgid_plural "_Report these contacts as abusive"
-msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu"
-msgstr[1] "P_rijavi ove kontakte za zloupotrebu"
-msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
-msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "Od_luÄi kasnije"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "Zahtev za pretplatu"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "_Block User"
-msgstr "_Blokiraj korisnika"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:71
-msgid "Ungrouped"
-msgstr "Negrupisano"
-
-#: ../libempathy-gtk/empathy-contact-list-store.h:72
-msgid "Favorite People"
-msgstr "Omiljeni ljudi"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-#: ../libempathy-gtk/empathy-individual-view.c:2376
-#, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "Da li ste sigurni da Åelite da uklonite grupu â%sâ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1988
-#: ../libempathy-gtk/empathy-individual-view.c:2379
-msgid "Removing group"
-msgstr "Uklanjam grupu"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2037
-#: ../libempathy-gtk/empathy-contact-list-view.c:2114
-#: ../libempathy-gtk/empathy-individual-view.c:2434
-#: ../libempathy-gtk/empathy-individual-view.c:2637
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-#: ../libempathy-gtk/empathy-individual-view.c:2501
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "Da li ste sigurni da Åelite da uklonite prijatelja â%sâ?"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:2069
-#: ../libempathy-gtk/empathy-individual-view.c:2522
-msgid "Removing contact"
-msgstr "Uklanjam prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:220
-#: ../src/empathy-main-window-menubar.ui.h:14
-msgid "_Add Contactâ"
-msgstr "Dod_aj prijateljaâ"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:300
-msgid "_Block Contact"
-msgstr "_Blokiraj kontakt"
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "Ukloni"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:329
-#: ../libempathy-gtk/empathy-individual-menu.c:758
-#: ../src/empathy-main-window-menubar.ui.h:16
-msgid "_Chat"
-msgstr "Äa_skanje"
+#. 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 "_UmnoÅi adresu veze"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:361
-#: ../libempathy-gtk/empathy-individual-menu.c:849
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "_Audio poziv"
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
+msgid "_Open Link"
+msgstr "_Otvori vezu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:394
-#: ../libempathy-gtk/empathy-individual-menu.c:894
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "_Video poziv"
+#. 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-contact-menu.c:440
-#: ../libempathy-gtk/empathy-individual-menu.c:947
-#: ../src/empathy-main-window-menubar.ui.h:27
-msgid "_Previous Conversations"
-msgstr "_Prethodni razgovori"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
+msgid "New Contact"
+msgstr "Novi prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:462
-#: ../libempathy-gtk/empathy-individual-menu.c:988
-msgid "Send File"
-msgstr "PoÅalji datoteku"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
+#, c-format
+msgid "Block %s?"
+msgstr "Blokirati %s?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:485
-#: ../libempathy-gtk/empathy-individual-menu.c:1030
-msgid "Share My Desktop"
-msgstr "Podeli moju radnu povrÅ"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr ""
+"Da li ste sigurni da Åelite da blokirate da vas â%sâ viÅe ne kontaktira?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:525
-#: ../libempathy-gtk/empathy-contact-widget.c:1886
-#: ../libempathy-gtk/empathy-individual-menu.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:1372
-msgid "Favorite"
-msgstr "Omiljeni"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "_Blokiraj"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:554
-#: ../libempathy-gtk/empathy-individual-menu.c:1093
-msgid "Infor_mation"
-msgstr "_Podaci"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "P_rijavi ovaj kontakt za zloupotrebu"
+msgstr[1] "P_rijavi ove kontakte za zloupotrebu"
+msgstr[2] "P_rijavi ove kontakte za zloupotrebu"
+msgstr[3] "P_rijavi ovaj kontakt za zloupotrebu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:600
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "Izm_eni"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "Zahtev za pretplatu"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:654
-#: ../libempathy-gtk/empathy-individual-menu.c:1284
-#: ../src/empathy-chat-window.c:1011
-msgid "Inviting you to this room"
-msgstr "Pozivam vas u ovu sobu"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "_Blokiraj korisnika"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:685
-#: ../libempathy-gtk/empathy-individual-menu.c:1330
-msgid "_Invite to Chat Room"
-msgstr "Pozov_i u sobu za Äaskanje"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "Od_luÄi kasnije"
 
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:505
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
 msgid "Search contacts"
 msgstr "PretraÅi kontakte"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:535
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
 msgid "Search: "
 msgstr "Pretraga:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:593
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
 msgid "_Add Contact"
 msgstr "Dod_aj prijatelja"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:611
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
 msgid "No contacts found"
 msgstr "Nije pronaÄen nijedan prijatelj"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:627
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
 msgid "Your message introducing yourself:"
 msgstr "Poruka koja vas predstavlja:"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:635
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
 msgid "Please let me see when you're online. Thanks!"
 msgstr "Molim vas obavestite ne kada ste na mreÅi. Hvala!"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "Izaberite prijatelja"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:336
-#: ../libempathy-gtk/empathy-individual-widget.c:153
-msgid "Full name:"
-msgstr "Puno ime:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:337
-#: ../libempathy-gtk/empathy-individual-widget.c:154
-msgid "Phone number:"
-msgstr "Broj telefona:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:338
-#: ../libempathy-gtk/empathy-individual-widget.c:155
-msgid "E-mail address:"
-msgstr "Adresa e-poÅte:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:339
-#: ../libempathy-gtk/empathy-individual-widget.c:156
-msgid "Website:"
-msgstr "Veb stranica:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:340
-#: ../libempathy-gtk/empathy-individual-widget.c:157
-msgid "Birthday:"
-msgstr "RoÄendan:"
-
-#. Note to translators: this is the caption for a string of the form "5
-#. * minutes ago", and refers to the time since the contact last interacted
-#. * with their IM client.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:346
-msgid "Last seen:"
-msgstr "ViÄen pre:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:348
-msgid "Connected from:"
-msgstr "Povezan sa:"
-
-#. FIXME: once Idle implements SimplePresence using this information, we can
-#. * and should bin this.
-#.
-#: ../libempathy-gtk/empathy-contact-widget.c:353
-msgid "Away message:"
-msgstr "Poruka za odsutnost:"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:606
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
 msgid "Channels:"
 msgstr "Kanali:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:469
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
 msgstr "ISO kod drÅave:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:899
-#: ../libempathy-gtk/empathy-individual-widget.c:471
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "DrÅava:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:901
-#: ../libempathy-gtk/empathy-individual-widget.c:473
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "Republika:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:903
-#: ../libempathy-gtk/empathy-individual-widget.c:475
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "Grad:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:905
-#: ../libempathy-gtk/empathy-individual-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "Oblast:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:907
-#: ../libempathy-gtk/empathy-individual-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "PoÅtanski kod:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:909
-#: ../libempathy-gtk/empathy-individual-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:911
-#: ../libempathy-gtk/empathy-individual-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "Zgrada:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:913
-#: ../libempathy-gtk/empathy-individual-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "Sprat:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:915
-#: ../libempathy-gtk/empathy-individual-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../libempathy-gtk/empathy-individual-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "Tekst:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:919
-#: ../libempathy-gtk/empathy-individual-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../libempathy-gtk/empathy-individual-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "Adresa:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:923
-#: ../libempathy-gtk/empathy-individual-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "Nivo taÄnosti:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:925
-#: ../libempathy-gtk/empathy-individual-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "GreÅka:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:927
-#: ../libempathy-gtk/empathy-individual-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
 msgstr "Uspravna greÅka (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:929
-#: ../libempathy-gtk/empathy-individual-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
 msgstr "Vodoravna greÅka (u metrima):"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:931
-#: ../libempathy-gtk/empathy-individual-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "Brzina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:933
-#: ../libempathy-gtk/empathy-individual-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "Pravac:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:935
-#: ../libempathy-gtk/empathy-individual-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "Brzina penjanja:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:937
-#: ../libempathy-gtk/empathy-individual-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
 msgstr "Poslednji put aÅurirano:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:939
-#: ../libempathy-gtk/empathy-individual-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "Geografska duÅina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:941
-#: ../libempathy-gtk/empathy-individual-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "Geografska Åirina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:943
-#: ../libempathy-gtk/empathy-individual-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "Visina:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-#: ../libempathy-gtk/empathy-contact-widget.c:1011
-#: ../libempathy-gtk/empathy-individual-widget.c:607
-#: ../libempathy-gtk/empathy-individual-widget.c:622
-#: ../src/empathy-preferences.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.c:848
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
 msgid "Location"
 msgstr "Lokacija"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:1013
-#: ../libempathy-gtk/empathy-individual-widget.c:624
+#: ../libempathy-gtk/empathy-contact-widget.c:865
+#: ../libempathy-gtk/empathy-individual-widget.c:610
 #, c-format
 msgid "%s, %s"
 msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1065
-#: ../libempathy-gtk/empathy-individual-widget.c:673
+#: ../libempathy-gtk/empathy-contact-widget.c:917
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%e.%d.%Y u %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1147
-#: ../libempathy-gtk/empathy-individual-widget.c:915
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "SaÄuvaj sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1203
-#: ../libempathy-gtk/empathy-individual-widget.c:973
+#: ../libempathy-gtk/empathy-contact-widget.c:1055
+#: ../libempathy-gtk/empathy-individual-widget.c:958
 msgid "Unable to save avatar"
 msgstr "Ne mogu da saÄuvam sliku"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>Lokacija</b> u (datum)\t"
-
-#. Alias
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1308
-msgid "Alias:"
-msgstr "Nadimak:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Client Information"
-msgstr "Podaci o klijentu"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client:"
-msgstr "Program:"
+#: ../libempathy-gtk/empathy-contact-widget.c:1446
+#| msgid "Technical Details"
+msgid "Personal Details"
+msgstr "LiÄni podaci"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1449
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
 msgid "Contact Details"
 msgstr "Detalji o prijatelju"
 
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+#| msgid "Full name:"
+msgid "Full name"
+msgstr "Ime i prezime"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+#| msgid "Phone number:"
+msgid "Phone number"
+msgstr "Broj telefona"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+#| msgid "E-mail address:"
+msgid "E-mail address"
+msgstr "Adresa el. poÅte"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+#| msgid "Website:"
+msgid "Website"
+msgstr "Veb stranica"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+#| msgid "Birthday:"
+msgid "Birthday"
+msgstr "RoÄendan"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "ViÄen pre:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "Povezan sa:"
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "Poruka za odsutnost:"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+#| msgid "Work"
+msgid "work"
+msgstr "posao"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+#| msgid "Romeo"
+msgid "home"
+msgstr "kuÄa"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+#| msgid "Mobile"
+msgid "mobile"
+msgstr "mobilni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+#| msgid "Favorite"
+msgid "voice"
+msgstr "glasovni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+#| msgid "Preferences"
+msgid "preferred"
+msgstr "prvenstveni"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "poÅtanski"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+#| msgid "Appearance"
+msgid "parcel"
+msgstr "poÅiljka"
+
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1517
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
 msgstr "Identifikator:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "Nadimak:"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>Lokacija</b> u (datum)\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
 msgid "Information requestedâ"
 msgstr "Zahtevani su podaciâ"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "Podaci o klijentu"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Version:"
 msgstr "Izdanje:"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:333
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "Program:"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "Grupe"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:345
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
@@ -2166,21 +2075,21 @@ msgstr ""
 "Izaberite grupe u kojima Åelite da se prijatelj nalazi.  Primetite da moÅete "
 "da odaberete i viÅe grupa kao i nijednu."
 
-#: ../libempathy-gtk/empathy-groups-widget.c:364
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "Dod_aj grupu"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:399
+#: ../libempathy-gtk/empathy-groups-widget.c:397
 msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:409
-#: ../src/empathy-main-window.c:1807
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1951
 msgid "Group"
 msgstr "Grupa"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:260
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "SledeÄi identitet Äe biti blokiran:"
@@ -2188,7 +2097,7 @@ msgstr[1] "SledeÄi identiteti Äe biti blokirani:"
 msgstr[2] "SledeÄi identiteti Äe biti blokirani:"
 msgstr[3] "SledeÄi identitet Äe biti blokiran:"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:267
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
 msgid "The following identity can not be blocked:"
 msgid_plural "The following identities can not be blocked:"
 msgstr[0] "SledeÄi identitet ne moÅe biti blokiran:"
@@ -2196,79 +2105,145 @@ msgstr[1] "SledeÄi identiteti ne mogu biti blokirani:"
 msgstr[2] "SledeÄi identiteti ne mogu biti blokirani:"
 msgstr[3] "SledeÄi identitet ne moÅe biti blokiran:"
 
-#. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
-msgid "Linked Contacts"
-msgstr "Povezani prijatelji"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:370
-msgid "Select contacts to link"
-msgstr "Izaberite prijatelja za povezivanje"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:444
-msgid "New contact preview"
-msgstr "Pregled novog prijatelja"
-
-#: ../libempathy-gtk/empathy-individual-linker.c:488
-msgid "Contacts selected in the list on the left will be linked together."
-msgstr "OznaÄeni prijatelji na spisku levo Äe biti uvezani zajedno."
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "Izmeni podatke kontakta"
 
 #. Translators: this is used in the context menu for a contact. The first
 #. * parameter is a contact ID (e.g. foo jabber org) and the second is one
 #. * of the user's account IDs (e.g. me hotmail com).
-#: ../libempathy-gtk/empathy-individual-menu.c:145
+#: ../libempathy-gtk/empathy-individual-menu.c:172
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:309
+#: ../libempathy-gtk/empathy-individual-menu.c:344
 msgid "Select account to use to place the call"
 msgstr "Izaberite nalog koji Äe biti koriÅÄen za poziv"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../libempathy-gtk/empathy-individual-menu.c:313
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-streamed-media-window.c:1299
-#: ../src/empathy-call-window.ui.h:2
+#: ../libempathy-gtk/empathy-individual-menu.c:348
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
 msgid "Call"
 msgstr "Poziv"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:378
+#: ../libempathy-gtk/empathy-individual-menu.c:413
 msgid "Mobile"
 msgstr "Mobilni"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:380
+#: ../libempathy-gtk/empathy-individual-menu.c:415
 msgid "Work"
 msgstr "Posao"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:382
+#: ../libempathy-gtk/empathy-individual-menu.c:417
 msgid "HOME"
 msgstr "KUÄA"
 
-#. add an SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:804
-#: ../libempathy-gtk/empathy-new-message-dialog.c:215
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "_Blokiraj kontakt"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "Äa_skanje"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
 msgid "_SMS"
 msgstr "_SMS"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1142
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "_Audio poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "_Video poziv"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "_Prethodni razgovori"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "PoÅalji datoteku"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "Podeli moju radnu povrÅ"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "Omiljeni"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1263
+#| msgid "telepathy-salut not installed"
+msgid "gnome-contacts not installed"
+msgstr "program gnomovi kontakti nije instaliran"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1266
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "Instalirajte âgnome-contactsâ da pristupite podacima kontakata."
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1377
+msgid "Infor_mation"
+msgstr "_Podaci"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1426
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#. Translators: this is a verb meaning "to connect two contacts together
-#. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:1168
-msgctxt "Link individual (contextual menu)"
-msgid "_Link Contactsâ"
-msgstr "_PoveÅi kontakteâ"
+#: ../libempathy-gtk/empathy-individual-menu.c:1543
+#: ../src/empathy-chat-window.c:1166
+msgid "Inviting you to this room"
+msgstr "Pozivam vas u ovu sobu"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1589
+msgid "_Invite to Chat Room"
+msgstr "Pozov_i u sobu za Äaskanje"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1785
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contactâ"
+msgstr "Dod_aj prijateljaâ"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2306
+msgid "Delete and _Block"
+msgstr "IzbriÅi i _blokiraj"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2341
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "Da li ste sigurni da Åelite da uklonite grupu â%sâ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+msgid "Removing group"
+msgstr "Uklanjam grupu"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2341
-msgid "Delete and _Block"
-msgstr "IzbriÅi i _blokiraj"
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2399
+#: ../libempathy-gtk/empathy-individual-view.c:2603
+msgid "_Remove"
+msgstr "_Ukloni"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2510
+#: ../libempathy-gtk/empathy-individual-view.c:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "Da li ste sigurni da Åelite da uklonite prijatelja â%sâ?"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2485
 #, c-format
 msgid ""
 "Do you really want to remove the linked contact '%s'? Note that this will "
@@ -2277,7 +2252,11 @@ msgstr ""
 "Da li stvarno Åelite da uklonite uvezani kontakt â%sâ? Ovo Äe ukloniti i sve "
 "kontakte koji su vezani za ovaj kontakt."
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1656
+#: ../libempathy-gtk/empathy-individual-view.c:2497
+msgid "Removing contact"
+msgstr "Uklanjam prijatelja"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
 #, c-format
 msgid "Linked contact containing %u contact"
 msgid_plural "Linked contacts containing %u contacts"
@@ -2290,23 +2269,23 @@ msgstr[3] "Uvezani prijatelj sadrÅi jedan kontakt"
 msgid "<b>Location</b> at (date)"
 msgstr "<b>Lokacija</b> u (datum)"
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Online from a phone or mobile device"
 msgstr "Na vezi preko telefona ili mobilnog ureÄaja"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
 msgid "New Network"
 msgstr "Nova mreÅa"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
 msgid "Choose an IRC network"
 msgstr "Odaberite IRC mreÅu"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
 msgid "Reset _Networks List"
 msgstr "Resetuj _mreÅni spisak"
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
 msgctxt "verb displayed on a button to select an IRC network"
 msgid "Select"
 msgstr "Izaberi"
@@ -2319,91 +2298,48 @@ msgstr "novi server"
 msgid "SSL"
 msgstr "SSL"
 
-#. Translators: this is the title of the linking dialogue (reached by
-#. * right-clicking on a contact and selecting "Linkâ"). "Link" in this title
-#. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:115
-msgid "Link Contacts"
-msgstr "PoveÅi prijatelje"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:120
-msgctxt "Unlink individual (button)"
-msgid "_Unlinkâ"
-msgstr "_RazveÅiâ"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
-msgid ""
-"Completely split the displayed linked contacts into the separate contacts."
-msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
-
-#. Add button
-#. Translators: this is an action button in the linking dialogue. "Link" is
-#. * used here as a verb meaning "to connect two contacts to form a
-#. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:136
-msgid "_Link"
-msgstr "_UveÅi"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
-#, c-format
-msgid "Unlink linked contacts '%s'?"
-msgstr "Da razveÅem uvezanog prijatelja â%sâ?"
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
-msgid ""
-"Are you sure you want to unlink these linked contacts? This will completely "
-"split the linked contacts into separate contacts."
-msgstr ""
-"Da li ste sigurni da Åelite da razveÅete uvezanog prijatelja? Ovim Äete "
-"razdvojiti uvezane kontakte u posebne prijatelje."
-
-#: ../libempathy-gtk/empathy-linking-dialog.c:190
-msgctxt "Unlink individual (button)"
-msgid "_Unlink"
-msgstr "_RazveÅi"
-
-#: ../libempathy-gtk/empathy-log-window.c:634
+#: ../libempathy-gtk/empathy-log-window.c:622
 msgid "History"
 msgstr "Istorijat"
 
-#: ../libempathy-gtk/empathy-log-window.c:689
+#: ../libempathy-gtk/empathy-log-window.c:677
 msgid "Show"
 msgstr "PrikaÅi"
 
-#: ../libempathy-gtk/empathy-log-window.c:711
+#: ../libempathy-gtk/empathy-log-window.c:699
 msgid "Search"
 msgstr "PotraÅi"
 
-#: ../libempathy-gtk/empathy-log-window.c:1159
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat in %s"
 msgstr "Äaskanje u %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1161
+#: ../libempathy-gtk/empathy-log-window.c:1152
 #, c-format
 msgid "Chat with %s"
 msgstr "Äaskanje sa %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1211
-#: ../libempathy-gtk/empathy-log-window.c:1358
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%A, %e %B %Y %X"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1300
+#: ../libempathy-gtk/empathy-log-window.c:1291
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1306
+#: ../libempathy-gtk/empathy-log-window.c:1297
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1382
+#: ../libempathy-gtk/empathy-log-window.c:1373
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
@@ -2412,7 +2348,7 @@ msgstr[1] "%s sekunde"
 msgstr[2] "%s sekundi"
 msgstr[3] "jedne sekunde"
 
-#: ../libempathy-gtk/empathy-log-window.c:1389
+#: ../libempathy-gtk/empathy-log-window.c:1380
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
@@ -2421,151 +2357,209 @@ msgstr[1] "%s minuta"
 msgstr[2] "%s minuta"
 msgstr[3] "jednog minuta"
 
-#: ../libempathy-gtk/empathy-log-window.c:1397
+#: ../libempathy-gtk/empathy-log-window.c:1388
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "Poziv je zapoÄet %s, a zavrÅen je %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1729
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Today"
 msgstr "Danas"
 
-#: ../libempathy-gtk/empathy-log-window.c:1733
+#: ../libempathy-gtk/empathy-log-window.c:1726
 msgid "Yesterday"
 msgstr "JuÄe"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1748
+#: ../libempathy-gtk/empathy-log-window.c:1741
 msgid "%e %B %Y"
 msgstr "%e. %B %Y."
 
 #: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3444
+#: ../libempathy-gtk/empathy-log-window.c:3489
 msgid "Anytime"
 msgstr "Bilo kad"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2372
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
 msgid "Anyone"
 msgstr "Bilo ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2685
+#: ../libempathy-gtk/empathy-log-window.c:2715
 msgid "Who"
 msgstr "Ko"
 
-#: ../libempathy-gtk/empathy-log-window.c:2889
+#: ../libempathy-gtk/empathy-log-window.c:2924
 msgid "When"
 msgstr "Kada"
 
-#: ../libempathy-gtk/empathy-log-window.c:3005
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Anything"
 msgstr "Bilo Åta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3007
+#: ../libempathy-gtk/empathy-log-window.c:3042
 msgid "Text chats"
 msgstr "Pisana Äaskanja"
 
-#: ../libempathy-gtk/empathy-log-window.c:3009
-#: ../src/empathy-preferences.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "Pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3014
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Incoming calls"
 msgstr "Dolazni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3015
+#: ../libempathy-gtk/empathy-log-window.c:3050
 msgid "Outgoing calls"
 msgstr "OdlazeÄi pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3016
+#: ../libempathy-gtk/empathy-log-window.c:3051
 msgid "Missed calls"
 msgstr "PropuÅteni pozivi"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3073
 msgid "What"
 msgstr "Åta"
 
-#: ../libempathy-gtk/empathy-log-window.c:3747
+#: ../libempathy-gtk/empathy-log-window.c:3782
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr ""
 "Da li ste sigurni da Åelite da obriÅete sve dnevnike prethodnih razgovora?"
 
-#: ../libempathy-gtk/empathy-log-window.c:3751
+#: ../libempathy-gtk/empathy-log-window.c:3786
 msgid "Clear All"
 msgstr "OÄisti sve"
 
-#: ../libempathy-gtk/empathy-log-window.c:3758
+#: ../libempathy-gtk/empathy-log-window.c:3793
 msgid "Delete from:"
 msgstr "ObriÅi od:"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "<span size=\"x-large\">Loading...</span>"
-msgstr "<span size=\"x-large\">UÄitavam...</span>"
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "Äaskanje"
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "Izm_eni"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Delete All History..."
 msgstr "ObriÅi sav istorijat..."
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-call-window.ui.h:22
-#: ../src/empathy-streamed-media-window.ui.h:20
-msgid "Video"
-msgstr "Video"
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "Äaskanje"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:7
-#: ../src/empathy-call-window.ui.h:28 ../src/empathy-chat-window.ui.h:12
-#: ../src/empathy-main-window-menubar.ui.h:20
-msgid "_Edit"
-msgstr "Izm_eni"
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "Video"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:8
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "page 2"
 msgstr "strana 2"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "IB prijatelja:"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">UÄitavam...</span>"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:225
-msgid "C_hat"
-msgstr "Ä_askaj"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#| msgid "The specified contact is offline"
+msgid "The contact is offline"
+msgstr "Kontakt nije na vezi"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#| msgid "The specified contact is not valid"
+msgid "The specified contact is either invalid or unknown"
+msgstr "Navedeni kontakt ili je neispravan ili nepoznat"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#| msgid "Topic not supported on this conversation"
+msgid "The contact does not support this kind of conversation"
+msgstr "Kontakt ne podrÅava ovu vrstu razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "Zahtevana funkcionalnost nije primenjena za ovaj protokol"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "Ne mogu da zapoÄnem razgovor sa datim kontaktom"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "IzbaÄeni ste sa ovog kanala"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "Ovaj kanal je pun"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#| msgid "You have been invited to join %s"
+msgid "You must be invited to join this channel"
+msgstr "Morate biti pozvani da se pridruÅite ovom kanalu"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#| msgid "Contact disconnected"
+msgid "Can't proceed while disconnected"
+msgstr "Ne mogu da nastavim dok je veza prekinuta"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#| msgid "permission denied"
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#| msgid "There was an error starting the call"
+msgid "There was an error starting the conversation"
+msgstr "DoÅlo je do greÅke prilikom zapoÄinjanja razgovora"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "Unesite odrednik kontakta ili telefonski broj:"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:244
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "Novi razgovor"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:204
-msgid "Send _Video"
-msgstr "PoÅalji _video"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#| msgctxt "menu item"
+#| msgid "_Video Call"
+msgid "_Video Call"
+msgstr "_Video poziv"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:215
-msgid "C_all"
-msgstr "_Pozovi"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#| msgctxt "menu item"
+#| msgid "_Audio Call"
+msgid "_Audio Call"
+msgstr "_Audio poziv"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "Novi poziv"
 
-#: ../libempathy-gtk/empathy-password-dialog.c:274
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+#| msgid "Authentication failed"
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "Nije uspelo potvrÄivanje identiteta za nalog <b>%s</b>"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
 msgid ""
 "Enter your password for account\n"
@@ -2602,12 +2596,8 @@ msgstr "Kliknite da postavite ovu poruku stanja kao omiljenu"
 msgid "Set status"
 msgstr "Postavi stanje"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:943
-msgid "Set your presence and current status"
-msgstr "Postavite vaÅe prisustvo i trenutno stanje"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1131
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 msgid "Custom messagesâ"
 msgstr "Proizvoljne porukeâ"
 
@@ -2625,20 +2615,20 @@ msgid "Find:"
 msgstr "TraÅi:"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Mat_ch case"
-msgstr "_Uporedi veliÄinu slova"
+msgid "_Previous"
+msgstr "_Prethodno"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
-msgid "Phrase not found"
-msgstr "Izraz nije pronaÄen"
-
-#: ../libempathy-gtk/empathy-search-bar.ui.h:4
 msgid "_Next"
 msgstr "_SledeÄe"
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "_Uporedi veliÄinu slova"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:5
-msgid "_Previous"
-msgstr "_Prethodno"
+msgid "Phrase not found"
+msgstr "Izraz nije pronaÄen"
 
 #: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
@@ -2684,12 +2674,12 @@ msgstr "Poziv za razgovor je zavrÅen"
 msgid "Edit Custom Messages"
 msgstr "Uredi proizvoljne poruke"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1036
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
 #, c-format
 msgid "Message edited at %s"
 msgstr "Poruka je ureÄena %s"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1726
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
 msgid "Normal"
 msgstr "Normalno"
 
@@ -2770,30 +2760,34 @@ msgid "Continue"
 msgstr "Nastavi"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "Nepoverljiva veza"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "Ova veza nije od poverenja. Åelite li ipak da nastavite?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:297
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
 msgid "Remember this choice for future connections"
 msgstr "Zapamti ovaj izbor za naredne veze"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:303
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
 msgid "Certificate Details"
 msgstr "Detalji sertifikata"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1735
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "Ne mogu da otvorim adresu"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1831
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1903
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
 msgid "Insufficient free space to save file"
 msgstr "Nema dovoljno slobodnog mesta za Äuvanje datoteke"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1911
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
 #, c-format
 msgid ""
 "%s of free space are required to save this file, but only %s is available. "
@@ -2802,7 +2796,7 @@ msgstr ""
 "Potrebno je %s za snimanje ove datoteke, ali je dostupno samo %s. Odaberite "
 "drugo mesto za snimanje."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#: ../libempathy-gtk/empathy-ui-utils.c:1986
 #, c-format
 msgid "Incoming file from %s"
 msgstr "DolazeÄa datoteka od %s"
@@ -2974,40 +2968,32 @@ msgstr "zapadni"
 msgid "Vietnamese"
 msgstr "vijetnamski"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "Izabrani prijatelj ne moÅe da primi datoteke."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "Izabrani prijatelj nije na vezi."
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "Nema poruka o greÅkama"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "Brza poruka (PismonoÅa)"
 
-#: ../src/empathy.c:431
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
 msgstr "Ne povezuj se po pokretanju"
 
-#: ../src/empathy.c:435
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr ""
 "Ne prikazuj spisak prijatelja niti bilo koje drugo prozorÄe po pokretanju"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
 msgstr "â Internet pismonoÅa za brze poruke"
 
-#: ../src/empathy.c:637
+#: ../src/empathy.c:643
 msgid "Error contacting the Account Manager"
 msgstr "GreÅka pri komunikaciji sa Upravnikom naloga"
 
-#: ../src/empathy.c:639
+#: ../src/empathy.c:645
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -3055,11 +3041,11 @@ msgstr ""
 "adresu: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301 USA"
 
-#: ../src/empathy-about-dialog.c:107
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gnomov program za brze poruke"
 
-#: ../src/empathy-about-dialog.c:113
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Danilo Åegan <dsegan gmx net>\n"
@@ -3101,35 +3087,36 @@ msgstr ""
 "zatvorite pomoÄnika i dodate naloge kasnije iz menija âIzmeniâ."
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1271
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "DoÅlo je do greÅke"
 
-#: ../src/empathy-account-assistant.c:467
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
 msgstr "Koji tip naloga za Äaskanje imate?"
 
-#: ../src/empathy-account-assistant.c:473
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "Da li imate joÅ neki nalog za Äaskanje koji Åelite da podesite?"
 
-#: ../src/empathy-account-assistant.c:479
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
 msgstr "Unesite detalje naloga"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
 msgstr "Koji tip naloga za Äaskanje Åelite da napravite?"
 
-#: ../src/empathy-account-assistant.c:490
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
 msgstr "Da li Åelite da napravite joÅ naloga za Äaskanje?"
 
-#: ../src/empathy-account-assistant.c:497
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
 msgstr "Unesite detalje novog naloga"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -3141,42 +3128,42 @@ msgstr ""
 "programe za Äaskanje. Sa mikrofonom i kamerom takoÄe moÅete da obavljate i "
 "audio i video pozive."
 
-#: ../src/empathy-account-assistant.c:629
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
 msgstr ""
 "Da li imate nalog koji ste koristili sa nekim drugim programom za Äaskanje?"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
 msgstr "Da, uvezi detalje mog naloga iz "
 
-#: ../src/empathy-account-assistant.c:673
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
 msgstr "Da, ja Äu sam uneti detalje naloga"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
 msgstr "Ne, Åelim novi nalog"
 
-#: ../src/empathy-account-assistant.c:705
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "Ne, za sada samo Åelim da vidim ljude u blizini"
 
-#: ../src/empathy-account-assistant.c:726
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
 msgstr "Izaberite naloge koje Åelite da uvezete:"
 
-#: ../src/empathy-account-assistant.c:813
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/empathy-account-assistant.c:820
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
 msgstr "Ne, to je sve za sada"
 
-#: ../src/empathy-account-assistant.c:1085
+#: ../src/empathy-account-assistant.c:1088
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -3188,16 +3175,16 @@ msgstr ""
 "su detalji ispod taÄni. Lako ih moÅete izmeniti kasnije ili iskljuÄiti ovu "
 "moguÄnost iz prozorÄeta âNaloziâ."
 
-#: ../src/empathy-account-assistant.c:1091
-#: ../src/empathy-account-assistant.c:1147
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
 msgstr "Izmeni->Nalozi"
 
-#: ../src/empathy-account-assistant.c:1107
+#: ../src/empathy-account-assistant.c:1110
 msgid "I do _not want to enable this feature for now"
 msgstr "Za sada _ne Åelim da koristim ovu moguÄnost"
 
-#: ../src/empathy-account-assistant.c:1143
+#: ../src/empathy-account-assistant.c:1148
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -3208,85 +3195,94 @@ msgstr ""
 "salut nije instaliran. Ako Åelite da omoguÄite ovo, instalirajte paket "
 "telepathy-salut i napravite nalog âLjudi u okoliniâ iz prozorÄeta âNaloziâ."
 
-#: ../src/empathy-account-assistant.c:1149
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut nije instaliran"
 
-#: ../src/empathy-account-assistant.c:1195
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "Asistent naloga za brze poruke i VoIP"
 
-#: ../src/empathy-account-assistant.c:1229
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "DobrodoÅli u Internet PismonoÅu"
 
-#: ../src/empathy-account-assistant.c:1238
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
 msgstr "Uvezite vaÅe postojeÄe naloge"
 
-#: ../src/empathy-account-assistant.c:1256
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "Unesite liÄne podatke"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:64
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "Postoje nesaÄuvane izmene na vaÅem nalogu %s."
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:68
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
 msgstr "VaÅ novi nalog joÅ nije saÄuvan."
 
-#: ../src/empathy-accounts-dialog.c:345
-#: ../src/empathy-streamed-media-window.c:754
-#: ../src/empathy-call-window.c:1216
+#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1325
 msgid "Connectingâ"
 msgstr "Povezujem seâ"
 
-#: ../src/empathy-accounts-dialog.c:386
+#: ../src/empathy-accounts-dialog.c:385
 #, c-format
 msgid "Offline â %s"
 msgstr "Nepovezan â %s"
 
-#: ../src/empathy-accounts-dialog.c:398
+#: ../src/empathy-accounts-dialog.c:397
 #, c-format
 msgid "Disconnected â %s"
 msgstr "Veza je prekinuta â %s"
 
-#: ../src/empathy-accounts-dialog.c:409
+#: ../src/empathy-accounts-dialog.c:408
 msgid "Offline â No Network Connection"
 msgstr "Nepovezan â Nema mreÅne konekcije"
 
-#: ../src/empathy-accounts-dialog.c:416
+#: ../src/empathy-accounts-dialog.c:415
 msgid "Unknown Status"
 msgstr "Nepoznato stanje"
 
-#: ../src/empathy-accounts-dialog.c:428
+#: ../src/empathy-accounts-dialog.c:427
 msgid "Offline â Account Disabled"
 msgstr "Nepovezan â Nalog je onemoguÄen"
 
-#: ../src/empathy-accounts-dialog.c:831
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr ""
-"Ovim Äete napraviti novi nalog, zanemarivÅi unete izmene.\n"
-"Da li sigurno Åelite da nastavite?"
+#: ../src/empathy-accounts-dialog.c:530
+#| msgid "Connection has been refused"
+msgid "Edit Connection Parameters"
+msgstr "Uredite parametre povezivanja"
+
+#: ../src/empathy-accounts-dialog.c:693
+msgid "Failed to retrieve your personal information from the server."
+msgstr "Nisam uspeo da dovuÄem vaÅe liÄne podatke sa servera."
 
-#: ../src/empathy-accounts-dialog.c:1192
+#: ../src/empathy-accounts-dialog.c:699
+msgid "Go online to edit your personal information."
+msgstr "Uspostavite vezu da uredite vaÅe liÄne podatke."
+
+#: ../src/empathy-accounts-dialog.c:784
+msgid "_Edit Connection Parameters..."
+msgstr "_Uredi parametre povezivanja..."
+
+#: ../src/empathy-accounts-dialog.c:1289
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "Da li ste sigurni da Åelite da uklonite â%sâ sa vaÅeg raÄunara?"
 
-#: ../src/empathy-accounts-dialog.c:1196
+#: ../src/empathy-accounts-dialog.c:1293
 msgid "This will not remove your account on the server."
 msgstr "Ovo neÄe ukloniti vaÅ nalog na serveru."
 
-#: ../src/empathy-accounts-dialog.c:1432
+#: ../src/empathy-accounts-dialog.c:1529
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3295,15 +3291,15 @@ msgstr ""
 "Da li sigurno Åelite da nastavite?"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1643
+#: ../src/empathy-accounts-dialog.c:1705
 msgid "_Enable"
 msgstr "_OmoguÄi"
 
-#: ../src/empathy-accounts-dialog.c:1644
+#: ../src/empathy-accounts-dialog.c:1706
 msgid "_Disable"
 msgstr "O_nemoguÄi"
 
-#: ../src/empathy-accounts-dialog.c:2154
+#: ../src/empathy-accounts-dialog.c:2176
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3315,19 +3311,15 @@ msgstr ""
 msgid "Addâ"
 msgstr "Dodajâ"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Loading account information"
-msgstr "UÄitavam podatke o nalogu"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "No protocol installed"
-msgstr "Nijedan protokol nije instaliran"
+msgid "_Importâ"
+msgstr "_Uveziâ"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
@@ -3335,15 +3327,19 @@ msgstr ""
 "Da dodate novi nalog, prvo morate da instalirate prikljuÄke za sve protokole "
 "koje Åelite da koristite."
 
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "Nijedan protokol nije instaliran"
+
 #: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Importâ"
-msgstr "_Uveziâ"
+msgid "Loading account information"
+msgstr "UÄitavam podatke o nalogu"
 
-#: ../src/empathy-auth-client.c:249
+#: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
 msgstr " â Internet pismonoÅa klijent prijave"
 
-#: ../src/empathy-auth-client.c:265
+#: ../src/empathy-auth-client.c:302
 msgid "Empathy authentication client"
 msgstr "Internet pismonoÅa klijent prijave"
 
@@ -3351,132 +3347,121 @@ msgstr "Internet pismonoÅa klijent prijave"
 msgid "People nearby"
 msgstr "Ljudi u okolini"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:192
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:193
 msgid "- Empathy Audio/Video Client"
 msgstr "â Internet pismonoÅa Audio/Video klijent"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:217
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:218
 msgid "Empathy Audio/Video Client"
 msgstr "Internet pismonoÅa Audio/Video klijent"
 
-#: ../src/empathy-streamed-media-window.c:431
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../src/empathy-streamed-media-window.c:434
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "Osvetljenost"
 
-#: ../src/empathy-streamed-media-window.c:437
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "Gama"
 
-#: ../src/empathy-streamed-media-window.c:542
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "JaÄina zvuka"
 
-#: ../src/empathy-streamed-media-window.c:1110
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "_BoÄna povrÅ"
 
-#: ../src/empathy-streamed-media-window.c:1130
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "ZvuÄni ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1134
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "Video ulaz"
 
-#: ../src/empathy-streamed-media-window.c:1140
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "BrojÄanik"
 
-#: ../src/empathy-streamed-media-window.c:1151
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "Detalji"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1220
-#: ../src/empathy-call-window.c:1825
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1927
 #, c-format
 msgid "Call with %s"
 msgstr "Poziv sa korisnikom %s"
 
-#: ../src/empathy-streamed-media-window.c:1453
-#: ../src/empathy-call-window.c:2069
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2171
 msgid "The IP address as seen by the machine"
 msgstr "IP adresa kako je vidi ovaj raÄunar"
 
-#: ../src/empathy-streamed-media-window.c:1455
-#: ../src/empathy-call-window.c:2071
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2173
 msgid "The IP address as seen by a server on the Internet"
 msgstr "IP adresa kako je vidi server na internetu"
 
-#: ../src/empathy-streamed-media-window.c:1457
-#: ../src/empathy-call-window.c:2073
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address of the peer as seen by the other side"
 msgstr "IP adresa vrÅnjaka kako je vidi druga strana"
 
-#: ../src/empathy-streamed-media-window.c:1459
-#: ../src/empathy-call-window.c:2075
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address of a relay server"
 msgstr "IP adresa relejnog servera"
 
-#: ../src/empathy-streamed-media-window.c:1461
-#: ../src/empathy-call-window.c:2077
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the multicast group"
 msgstr "IP adresa grupe za viÅestruko emitovanje"
 
-#: ../src/empathy-streamed-media-window.c:1843
-msgctxt "encoding video codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1846
-msgctxt "encoding audio codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1849
-msgctxt "decoding video codec"
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: ../src/empathy-streamed-media-window.c:1852
-msgctxt "decoding audio codec"
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+#| msgid "Unknown"
+msgctxt "codec"
 msgid "Unknown"
 msgstr "Nepoznato"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2144
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected â %d:%02dm"
 msgstr "Povezan â %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2205
-#: ../src/empathy-call-window.c:2846
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3033
 msgid "Technical Details"
 msgstr "TehniÄki detalji"
 
-#: ../src/empathy-streamed-media-window.c:2243
-#: ../src/empathy-call-window.c:2884
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3072
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan zvuÄni format koji podrÅava vaÅ raÄunar"
 
-#: ../src/empathy-streamed-media-window.c:2248
-#: ../src/empathy-call-window.c:2889
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3077
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "Program %s ne razume nijedan video format koji podrÅava vaÅ raÄunar"
 
-#: ../src/empathy-streamed-media-window.c:2254
-#: ../src/empathy-call-window.c:2895
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3083
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -3485,27 +3470,27 @@ msgstr ""
 "Ne mogu da uspostavim vezu sa %s. MoÅda je neko od vas dvoje na mreÅi koja "
 "ne dozvoljava direktne veze."
 
-#: ../src/empathy-streamed-media-window.c:2260
-#: ../src/empathy-call-window.c:2901
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3089
 msgid "There was a failure on the network"
 msgstr "DoÅlo je do greÅke u mreÅi"
 
-#: ../src/empathy-streamed-media-window.c:2264
-#: ../src/empathy-call-window.c:2905
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3093
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "ZvuÄni formati potrebni za ovaj poziv nisu instalirani na vaÅem raÄunaru"
 
-#: ../src/empathy-streamed-media-window.c:2267
-#: ../src/empathy-call-window.c:2908
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3096
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Video formati potrebni za ovaj poziv nisu instalirani na vaÅem raÄunaru"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:2920
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3108
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3516,161 +3501,219 @@ msgstr ""
 "\">ovu greÅku</a> i prikaÄite dnevnike pokupljene iz prozora âOtklanjanje "
 "greÅakaâ u meniju âPomoÄâ."
 
-#: ../src/empathy-streamed-media-window.c:2285
-#: ../src/empathy-call-window.c:2929
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3117
 msgid "There was a failure in the call engine"
 msgstr "DoÅlo je do greÅke u motoru za pozive"
 
-#: ../src/empathy-streamed-media-window.c:2288
-#: ../src/empathy-call-window.c:2932
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3120
 msgid "The end of the stream was reached"
 msgstr "Dostignut je kraj toka"
 
-#: ../src/empathy-streamed-media-window.c:2328
-#: ../src/empathy-call-window.c:2972
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3160
 msgid "Can't establish audio stream"
 msgstr "Ne mogu da uspostavim zvuÄni tok"
 
-#: ../src/empathy-streamed-media-window.c:2338
-#: ../src/empathy-call-window.c:2982
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3170
 msgid "Can't establish video stream"
 msgstr "Ne mogu da uspostavim video tok"
 
-#: ../src/empathy-call-window.ui.h:1 ../src/empathy-preferences.ui.h:2
+#: ../src/empathy-call-window.ui.h:1
 #: ../src/empathy-streamed-media-window.ui.h:1
-msgid "Audio"
-msgstr "Audio"
+msgid "_Call"
+msgstr "_Pozovi"
 
 #: ../src/empathy-call-window.ui.h:3
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "Kodek za dekodiranje:"
+msgid "_Microphone"
+msgstr "Mi_krofon"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Disable camera"
-msgstr "IskljuÄite kamericu"
+msgid "_Camera"
+msgstr "_Kamerica"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Display the dialpad"
-msgstr "PrikaÅite brojÄanik"
+msgid "_Settings"
+msgstr "Po_deÅavanja"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-streamed-media-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "Kodek za kodiranje:"
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
+msgid "_View"
+msgstr "Pre_gled"
 
-#: ../src/empathy-call-window.ui.h:7
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Hang up"
-msgstr "Prekini"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "Po_moÄ"
 
-#: ../src/empathy-call-window.ui.h:8
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Hang up current call"
-msgstr "Prekinite trenutni poziv"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "_SadrÅaj"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-streamed-media-window.ui.h:12
-msgid "Local Candidate:"
-msgstr "Lokalni kandidat:"
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "Otklanjanje _greÅaka"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Maximise me"
-msgstr "UveÄaj me"
+msgid "Swap camera"
+msgstr "Razmeni kameru"
 
 #: ../src/empathy-call-window.ui.h:11
 msgid "Minimise me"
 msgstr "Umanji me"
 
 #: ../src/empathy-call-window.ui.h:12
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Remote Candidate:"
-msgstr "Udaljeni kandidat:"
+msgid "Maximise me"
+msgstr "UveÄaj me"
 
 #: ../src/empathy-call-window.ui.h:13
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Send Audio"
-msgstr "PoÅalji zvuk"
+msgid "Disable camera"
+msgstr "IskljuÄite kamericu"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Video"
-msgstr "PoÅalji video"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "Prekini"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Show dialpad"
-msgstr "PrikaÅi brojÄanik"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "Prekinite trenutni poziv"
 
 #: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "Video poziv"
+
+#: ../src/empathy-call-window.ui.h:17
 msgid "Start a video call"
 msgstr "ZapoÄnite video poziv"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start an audio call"
 msgstr "ZapoÄnite audio poziv"
 
-#: ../src/empathy-call-window.ui.h:18
-msgid "Swap camera"
-msgstr "Razmeni kameru"
-
-#: ../src/empathy-call-window.ui.h:19
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Toggle audio transmission"
-msgstr "UkljuÄi/iskljuÄi prenos zvuka"
-
 #: ../src/empathy-call-window.ui.h:20
-msgid "Toggle video transmission"
-msgstr "UkljuÄi/iskljuÄi prenos videa"
+msgid "Show dialpad"
+msgstr "PrikaÅi brojÄanik"
 
 #: ../src/empathy-call-window.ui.h:21
-#: ../src/empathy-streamed-media-window.ui.h:18
-#: ../src/empathy-call-window.c:2476 ../src/empathy-call-window.c:2477
-#: ../src/empathy-call-window.c:2478 ../src/empathy-call-window.c:2479
-msgid "Unknown"
-msgstr "Nepoznato"
+msgid "Display the dialpad"
+msgstr "PrikaÅite brojÄanik"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "PoÅalji video"
 
 #: ../src/empathy-call-window.ui.h:23
-msgid "Video call"
-msgstr "Video poziv"
+msgid "Toggle video transmission"
+msgstr "UkljuÄi/iskljuÄi prenos videa"
 
 #: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:24
-msgid "_Call"
-msgstr "_Pozovi"
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "PoÅalji zvuk"
 
 #: ../src/empathy-call-window.ui.h:25
-msgid "_Camera"
-msgstr "_Kamerica"
-
-#: ../src/empathy-call-window.ui.h:26 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-main-window-menubar.ui.h:18
-msgid "_Contents"
-msgstr "_SadrÅaj"
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "UkljuÄi/iskljuÄi prenos zvuka"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-main-window-menubar.ui.h:19
-msgid "_Debug"
-msgstr "Otklanjanje _greÅaka"
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "Kodek za kodiranje:"
 
-#: ../src/empathy-call-window.ui.h:29 ../src/empathy-chat-window.ui.h:14
-#: ../src/empathy-main-window-menubar.ui.h:22
-msgid "_Help"
-msgstr "Po_moÄ"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2580 ../src/empathy-call-window.c:2581
+#: ../src/empathy-call-window.c:2582 ../src/empathy-call-window.c:2583
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "Kodek za dekodiranje:"
 
 #: ../src/empathy-call-window.ui.h:30
-msgid "_Microphone"
-msgstr "Mi_krofon"
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "Udaljeni kandidat:"
 
 #: ../src/empathy-call-window.ui.h:31
-msgid "_Settings"
-msgstr "Po_deÅavanja"
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "Lokalni kandidat:"
 
-#: ../src/empathy-call-window.ui.h:32
-#: ../src/empathy-main-window-menubar.ui.h:30
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
 #: ../src/empathy-streamed-media-window.ui.h:25
-msgid "_View"
-msgstr "Pre_gled"
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/empathy-chat-window.c:285
+#| msgid "Hide the main window."
+msgid "Close this window?"
+msgstr "Da zatvorim ovaj prozor?"
 
-#: ../src/empathy-chat-window.c:481 ../src/empathy-chat-window.c:501
+#: ../src/empathy-chat-window.c:290
+#, c-format
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr ""
+"Zatvaranjem ovog prozora biÄe napuÅteno %s. NeÄete primati nikakve buduÄe "
+"poruke sve dok se ponovo ne pridruÅite."
+
+#: ../src/empathy-chat-window.c:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"Zatvaranjem ovog prozora biÄe napuÅtena %u soba za Äaskanje. NeÄete primati "
+"nikakve buduÄe poruke sve dok se ponovo ne pridruÅite."
+msgstr[1] ""
+"Zatvaranjem ovog prozora biÄe napuÅtene %u sobe za Äaskanje. NeÄete primati "
+"nikakve buduÄe poruke sve dok se ponovo ne pridruÅite."
+msgstr[2] ""
+"Zatvaranjem ovog prozora biÄe napuÅteno %u soba za Äaskanje. NeÄete primati "
+"nikakve buduÄe poruke sve dok se ponovo ne pridruÅite."
+msgstr[3] ""
+"Zatvaranjem ovog prozora biÄe napuÅtena jedna soba za Äaskanje. NeÄete primati "
+"nikakve buduÄe poruke sve dok se ponovo ne pridruÅite."
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+#| msgid "Level "
+msgid "Leave %s?"
+msgstr "Da napustim %s?"
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr ""
+"NeÄete primati nikakve buduÄe poruke iz ove sobe za Äaskanje sve dok joj se "
+"ponovo ne pridruÅite."
+
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "Zatvori prozor"
+
+#: ../src/empathy-chat-window.c:330
+#| msgid "Level "
+msgid "Leave room"
+msgstr "Napusti sobu"
+
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
@@ -3679,7 +3722,7 @@ msgstr[1] "%s (%d neproÄitane)"
 msgstr[2] "%s (%d neproÄitanih)"
 msgstr[3] "%s (jedna neproÄitana)"
 
-#: ../src/empathy-chat-window.c:493
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
@@ -3688,7 +3731,7 @@ msgstr[1] "%s (i %u druge)"
 msgstr[2] "%s (i %u drugih)"
 msgstr[3] "%s (i jedna druga)"
 
-#: ../src/empathy-chat-window.c:509
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
@@ -3697,7 +3740,7 @@ msgstr[1] "%s (%d neproÄitane od ostalih)"
 msgstr[2] "%s (%d neproÄitanih od ostalih)"
 msgstr[3] "%s (jedna neproÄitana od ostalih)"
 
-#: ../src/empathy-chat-window.c:518
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
@@ -3706,11 +3749,11 @@ msgstr[1] "%s (%d neproÄitane od svih)"
 msgstr[2] "%s (%d neproÄitanih od svih)"
 msgstr[3] "%s (jedna neproÄitana od svih)"
 
-#: ../src/empathy-chat-window.c:733
+#: ../src/empathy-chat-window.c:888
 msgid "SMS:"
 msgstr "SMS:"
 
-#: ../src/empathy-chat-window.c:743
+#: ../src/empathy-chat-window.c:898
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
@@ -3719,69 +3762,69 @@ msgstr[1] "Åaljem %d poruke."
 msgstr[2] "Åaljem %d poruka."
 msgstr[3] "Åaljem jednu poruku"
 
-#: ../src/empathy-chat-window.c:765
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "PiÅe poruku."
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "_OÄisti"
+msgid "_Conversation"
+msgstr "_Razgovor"
 
 #: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "_Prijatelj"
+msgid "C_lear"
+msgstr "_OÄisti"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Insert _Smiley"
 msgstr "Ubaci _smeÅak"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "Omiljena soba za _Äaskanje"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participantâ"
-msgstr "Pozovi _uÄesnikeâ"
+msgid "Notify for All Messages"
+msgstr "Obavesti za sve poruke"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "Premesti jeziÄak _levo"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "PrikaÅi _spisak prijatelja"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "Premesti jeziÄak _desno"
+msgid "Invite _Participantâ"
+msgstr "Pozovi _uÄesnikeâ"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "Obavesti za sve poruke"
+msgid "C_ontact"
+msgstr "_Prijatelj"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "_Razgovor"
+msgid "_Tabs"
+msgstr "_Listovi"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "_OtkaÄi list"
-
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "Omiljena soba za _Äaskanje"
+msgid "_Previous Tab"
+msgstr "_Prethodni list"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Next Tab"
 msgstr "_SledeÄi list"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "_Prethodni list"
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "_Opozovi zatvaranje jeziÄka"
 
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "PrikaÅi _spisak prijatelja"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "Premesti jeziÄak _levo"
 
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "_Listovi"
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "Premesti jeziÄak _desno"
 
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "_Opozovi zatvaranje jeziÄka"
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "_OtkaÄi list"
 
 #: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
@@ -3795,100 +3838,100 @@ msgstr "Soba"
 msgid "Auto-Connect"
 msgstr "Automatsko povezivanje"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "Uredi omiljene sobe"
 
-#: ../src/empathy-event-manager.c:521
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "Dolazni video poziv"
 
-#: ../src/empathy-event-manager.c:521 ../src/empathy-call-window.c:1449
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1555
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: ../src/empathy-event-manager.c:525
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s vas zove video pozivom. Åelite li da se javite?"
 
-#: ../src/empathy-event-manager.c:526
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s vas zove. Åelite li da se javite?"
 
-#: ../src/empathy-event-manager.c:529 ../src/empathy-event-manager.c:730
-#: ../src/empathy-event-manager.c:763 ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming call from %s"
 msgstr "Dolazni poziv od %s"
 
-#: ../src/empathy-event-manager.c:554
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "_Odbaci"
 
-#: ../src/empathy-event-manager.c:562 ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "_Javi se"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:572
 msgid "_Answer with video"
 msgstr "Odgovori sa _videom"
 
-#: ../src/empathy-event-manager.c:730 ../src/empathy-event-manager.c:763
-#: ../src/empathy-call-window.c:1455
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1561
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "Dolazni video poziv od %s"
 
-#: ../src/empathy-event-manager.c:836
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "Pozivnice za sobu"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "Pozivnica da se pridruÅite u %s"
 
-#: ../src/empathy-event-manager.c:845
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s vas poziva da se pridruÅite %s"
 
-#: ../src/empathy-event-manager.c:853
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../src/empathy-event-manager.c:858
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "_PrikljuÄi se"
 
-#: ../src/empathy-event-manager.c:885
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s vas poziva da se pridruÅite %s"
 
-#: ../src/empathy-event-manager.c:891
+#: ../src/empathy-event-manager.c:893
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "Pozvani ste da se pridruÅite u %s"
 
-#: ../src/empathy-event-manager.c:942
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "Dolazni prenos datoteke od %s"
 
-#: ../src/empathy-event-manager.c:1134 ../src/empathy-main-window.c:375
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:372
 msgid "Password required"
 msgstr "Zahtevana je lozinka"
 
-#: ../src/empathy-event-manager.c:1190
+#: ../src/empathy-event-manager.c:1217
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s traÅi odobrenje da vidi kada ste na vezi"
 
-#: ../src/empathy-event-manager.c:1194
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -3898,105 +3941,105 @@ msgstr ""
 "Poruka: %s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s od %s pri %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:306
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "Primam â%sâ od %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "Åaljem â%sâ za %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "GreÅka pri primanju â%sâ od %s"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "GreÅka pri primanju datoteke"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "GreÅka pri slanju â%sâ za %s"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "GreÅka pri slanju datoteke"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "â%sâ je primljen od %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr " â%sâ je poslat za %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "Prenos datoteke je zavrÅen"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:780
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "Äekam na odgovor druge strane"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "Proveravam integritet datoteke â%sâ"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "TraÅim heÅ datoteke â%sâ"
 
-#: ../src/empathy-ft-manager.c:1026
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1038
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/empathy-ft-manager.c:1060
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "Preostalo"
 
@@ -4021,166 +4064,193 @@ msgid "Import Accounts"
 msgstr "Uvezite naloge"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "Uvezi"
 
-#: ../src/empathy-import-widget.c:310
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "Protokol"
 
-#: ../src/empathy-import-widget.c:334
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/empathy-main-window.c:392
+#: ../src/empathy-roster-window.c:389
 msgid "Provide Password"
 msgstr "Unesite lozinku"
 
-#: ../src/empathy-main-window.c:398
+#: ../src/empathy-roster-window.c:395
 msgid "Disconnect"
 msgstr "Veza je prekinuta"
 
-#: ../src/empathy-main-window.c:622
+#: ../src/empathy-roster-window.c:644
+msgid "You need to setup an account to see contacts here."
+msgstr "Morate da podesite nalog da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:660
 msgid "No match found"
 msgstr "Nema poklapanja"
 
-#: ../src/empathy-main-window.c:777
+#: ../src/empathy-roster-window.c:765
+#, c-format
+msgid "Sorry, %s accounts canât be used until your %s software is updated."
+msgstr ""
+"Izvinite, %s nalozi ne mogu biti koriÅÄeni sve dok ne aÅurirate vaÅ %s "
+"softver."
+
+#: ../src/empathy-roster-window.c:831
+msgid "Update software..."
+msgstr "AÅuriraj softver..."
+
+#: ../src/empathy-roster-window.c:837 ../src/empathy-roster-window.c:954
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../src/empathy-roster-window.c:942
 msgid "Reconnect"
 msgstr "Ponovo se poveÅi"
 
-#: ../src/empathy-main-window.c:783
+#: ../src/empathy-roster-window.c:948
 msgid "Edit Account"
 msgstr "Izmeni nalog"
 
-#: ../src/empathy-main-window.c:789
-msgid "Close"
-msgstr "Zatvori"
-
 #. Translators: this string will be something like:
-#. *   Top up My Account ($1.23)..."
-#: ../src/empathy-main-window.c:928
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1092
 #, c-format
 msgid "Top up %s (%s)..."
 msgstr "Dopuni %s (%s)..."
 
-#: ../src/empathy-main-window.c:975
+#: ../src/empathy-roster-window.c:1138
 msgid "Top up account credit"
 msgstr "Dopunite kredit naloga"
 
 #. top up button
-#: ../src/empathy-main-window.c:1046
+#: ../src/empathy-roster-window.c:1210
 msgid "Top Up..."
 msgstr "Dopuni..."
 
-#: ../src/empathy-main-window.c:1789
+#: ../src/empathy-roster-window.c:1933
 msgid "Contact"
 msgstr "Prijatelj"
 
-#: ../src/empathy-main-window.c:2121
+#: ../src/empathy-roster-window.c:2131
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "Morate da ukljuÄite jedan od vaÅih naloga da biste ovde videli kontakte."
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2139
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "Morate da ukljuÄite %s da biste ovde videli kontakte."
+
+#: ../src/empathy-roster-window.c:2419
 msgid "Contact List"
 msgstr "Spisak prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "Prijatelji na _mapi"
+#: ../src/empathy-roster-window.ui.h:1
+#| msgid "_Accounts"
+msgid "Account settings"
+msgstr "PodeÅavanja naloga"
 
-#: ../src/empathy-main-window-menubar.ui.h:2
-msgid "Credit Balance"
-msgstr "Iznos gotovine"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversationâ"
+msgstr "_Novi razgovorâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:3
-msgid "Find in Contact _List"
-msgstr "PronaÄi u _spisku prijatelja"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Callâ"
+msgstr "Novi _pozivâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:4
-msgid "Join _Favorites"
-msgstr "PridruÅi se _omiljenim"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contactsâ"
+msgstr "_TraÅi prijateljeâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:5
-msgid "Manage Favorites"
-msgstr "Uredi omiljene"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "Prenosi _datoteka"
 
-#: ../src/empathy-main-window-menubar.ui.h:6
-msgid "N_ormal Size"
-msgstr "N_ormalna veliÄina"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "Nep_ovezani prijatelji"
 
-#: ../src/empathy-main-window-menubar.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Callâ"
-msgstr "Novi _pozivâ"
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "PrikaÅi _protokole"
 
-#: ../src/empathy-main-window-menubar.ui.h:8
-msgid "Normal Size With _Avatars"
-msgstr "Normalna veliÄina sa _avatarima"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "Iznos gotovine"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "Prijatelji na _mapi"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "N_alozi"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "_Blokirani prijatelji"
 
-#: ../src/empathy-main-window-menubar.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:15
 msgid "P_references"
 msgstr "_Postavke"
 
-#: ../src/empathy-main-window-menubar.ui.h:10
-msgid "Show P_rotocols"
-msgstr "PrikaÅi _protokole"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "PronaÄi u _spisku prijatelja"
 
-#: ../src/empathy-main-window-menubar.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "PoreÄaj prema _imenu"
 
-#: ../src/empathy-main-window-menubar.ui.h:12
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "PoreÄaj prema _stanju"
 
-#: ../src/empathy-main-window-menubar.ui.h:13
-msgid "_Accounts"
-msgstr "N_alozi"
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "Normalna veliÄina sa _avatarima"
 
-#: ../src/empathy-main-window-menubar.ui.h:15
-msgid "_Blocked Contacts"
-msgstr "_Blokirani prijatelji"
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "N_ormalna veliÄina"
 
-#: ../src/empathy-main-window-menubar.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "_Kompaktna veliÄina"
 
-#: ../src/empathy-main-window-menubar.ui.h:21
-msgid "_File Transfers"
-msgstr "Prenosi _datoteka"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "_Soba"
 
-#: ../src/empathy-main-window-menubar.ui.h:23
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Joinâ"
 msgstr "_PrikljuÄi seâ"
 
-#: ../src/empathy-main-window-menubar.ui.h:24
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversationâ"
-msgstr "_Novi razgovorâ"
-
-#: ../src/empathy-main-window-menubar.ui.h:25
-msgid "_Offline Contacts"
-msgstr "Nep_ovezani prijatelji"
-
-#: ../src/empathy-main-window-menubar.ui.h:26
-msgid "_Personal Information"
-msgstr "LiÄni _podaci"
-
-#: ../src/empathy-main-window-menubar.ui.h:28
-msgid "_Room"
-msgstr "_Soba"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "PridruÅi se _omiljenim"
 
-#: ../src/empathy-main-window-menubar.ui.h:29
-msgid "_Search for Contactsâ"
-msgstr "_TraÅi prijateljeâ"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "Uredi omiljene"
 
-#: ../src/empathy-new-chatroom-dialog.c:337
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "Soba za Äaskanje"
 
-#: ../src/empathy-new-chatroom-dialog.c:353
+#: ../src/empathy-new-chatroom-dialog.c:385
 msgid "Members"
 msgstr "Älanovi"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:553
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
 "%s\n"
@@ -4193,22 +4263,22 @@ msgstr ""
 "Potrebna lozinka: %s\n"
 "Älanovi: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:555
-#: ../src/empathy-new-chatroom-dialog.c:556
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "Ne"
 
-#: ../src/empathy-new-chatroom-dialog.c:584
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "Ne mogu da pokrenem listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.c:594
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "Ne mogu da zaustavim listanje spiska soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "Ne mogu da uÄitam spisak soba"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "PridruÅi se sobi"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -4217,6 +4287,10 @@ msgstr ""
 "Ovde unesite ime sobe za pridruÅivanje ili kliknite na neku od soba na spisku."
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "_Soba:"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
@@ -4224,313 +4298,314 @@ msgstr ""
 "Unesite server koji ugoÅÄava sobe, ili ostavite prazno ako su sobe na "
 "serveru na kojem vam je nalog"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "PridruÅi se sobi"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "Ne mogu da uÄitam spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "Spisak soba"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "_Soba:"
-
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "Poruka je primljena"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "Poruka je poslata"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "Novi razgovor"
 
-#: ../src/empathy-preferences.c:172
-msgid "Contact goes online"
+#: ../src/empathy-preferences.c:169
+#| msgid "Contact goes online"
+msgid "Contact comes online"
 msgstr "Prijatelj se prijavio"
 
-#: ../src/empathy-preferences.c:173
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
 msgstr "Prijatelj se odjavio"
 
-#: ../src/empathy-preferences.c:174
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
 msgstr "Nalog je na vezi"
 
-#: ../src/empathy-preferences.c:175
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
 msgstr "Nalog nije na vezi"
 
-#: ../src/empathy-preferences.c:484
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "Jezik"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:734
+#: ../src/empathy-preferences.c:726
 msgid "Juliet"
 msgstr "Paja"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:741
+#: ../src/empathy-preferences.c:733
 msgid "Romeo"
 msgstr "Jare"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:747
+#: ../src/empathy-preferences.c:739
 msgid "O Romeo, Romeo, wherefore art thou Romeo?"
 msgstr "Jao, kume, gotov sam!! Ja sam bivÅi Äovek!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:750
+#: ../src/empathy-preferences.c:743
 msgid "Deny thy father and refuse thy name;"
 msgstr "Pajo, Åta je bilo, Pajooo??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:753
+#: ../src/empathy-preferences.c:746
 msgid "Or if thou wilt not, be but sworn my love"
 msgstr "Kako Åta je bilo?? Nema je viÅe, ukrali su mi je!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:756
+#: ../src/empathy-preferences.c:749
 msgid "And I'll no longer be a Capulet."
 msgstr "Åta su ti ukrali, Pajo?? Åtaaaa??"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:759
+#: ../src/empathy-preferences.c:752
 msgid "Shall I hear more, or shall I speak at this?"
 msgstr "Kako Åta?? Ama laÄu, ukrali su mi laÄu!! Jao meni!!!"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:762
+#: ../src/empathy-preferences.c:755
 msgid "Juliet has disconnected"
 msgstr "Sav oÄajan, Paja je prekinuo vezu."
 
-#: ../src/empathy-preferences.c:1166
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "Postavke"
 
 #: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "PrikaÅi slike _smeÅaka"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "PrikaÅi spisak _prijatelja u sobama"
+
+#: ../src/empathy-preferences.ui.h:3
 msgid "Appearance"
 msgstr "Izgled"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "PonaÅanje"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "ZapoÄni Äaskanja u:"
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Chat Th_eme:"
-msgstr "_Tema Äaskanja:"
+msgid "new ta_bs"
+msgstr "novim _jeziÄcima"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Disable notifications when _away or busy"
-msgstr "IskljuÄi obaveÅtenja kada sam _odsutan ili zauzet"
+msgid "new _windows"
+msgstr "novim _prozorima"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Disable sounds when _away or busy"
-msgstr "IskljuÄi zvuke kada sam _odsutan ili zauzet"
-
-#: ../src/empathy-preferences.ui.h:8
 msgid "Display incoming events in the notification area"
 msgstr "PrikaÅi dolazne dogaÄaje u obaveÅtajnoj zoni"
 
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "_Sam se poveÅi nakon pokretanja"
+
 #: ../src/empathy-preferences.ui.h:9
-msgid ""
-"Echo cancellation helps to make your voice sound clearer to the other "
-"person, but may cause problems on some computers. If you or the other person "
-"hear strange noises or glitches during calls, try turning echo cancellation "
-"off and restarting the call."
-msgstr ""
-"Uklanjanje odjeka Äini da vaÅ glas drugoj osobi zvuÄi jasnije, ali moÅe da "
-"izazove probleme na nekim raÄunarima. Ako vi ili vaÅ sagovornik Äujete Äudne "
-"Åumove ili krÄanje za vreme poziva, pokuÅajte da iskljuÄite uklanjanje odjeka i "
-"ponovo pokrenite poziv."
+msgid "Log conversations"
+msgstr "ZabeleÅi razgovore"
 
-#: ../src/empathy-preferences.ui.h:10
-msgid "Enable notifications when a contact comes online"
-msgstr "OmoguÄi obaveÅtenja kada prijatelj doÄe na mreÅu"
+#: ../src/empathy-preferences.ui.h:10
+msgid "Behavior"
+msgstr "PonaÅanje"
 
 #: ../src/empathy-preferences.ui.h:11
-msgid "Enable notifications when a contact goes offline"
-msgstr "OmoguÄi obaveÅtenja kada prijatelj ode sa mreÅe"
+msgid "General"
+msgstr "OpÅte"
 
 #: ../src/empathy-preferences.ui.h:12
-msgid "Enable notifications when the _chat is not focused"
-msgstr "OmoguÄi obaveÅtenja kada _Äaskanja nisu u fokusu"
+msgid "_Enable bubble notifications"
+msgstr "_OmoguÄi obaveÅtenja u oblaÄiÄima"
 
 #: ../src/empathy-preferences.ui.h:13
-msgid "Enable spell checking for languages:"
-msgstr "OmoguÄi proveru pravopisa za sledeÄe jezike:"
+msgid "Disable notifications when _away or busy"
+msgstr "IskljuÄi obaveÅtenja kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:14
-msgid "General"
-msgstr "OpÅte"
+msgid "Enable notifications when the _chat is not focused"
+msgstr "OmoguÄi obaveÅtenja kada _Äaskanja nisu u fokusu"
 
 #: ../src/empathy-preferences.ui.h:15
-msgid "Input level:"
-msgstr "Ulazni nivo:"
+msgid "Enable notifications when a contact comes online"
+msgstr "OmoguÄi obaveÅtenja kada prijatelj doÄe na mreÅu"
 
 #: ../src/empathy-preferences.ui.h:16
-msgid "Input volume:"
-msgstr "JaÄina ulaznog zvuka:"
+msgid "Enable notifications when a contact goes offline"
+msgstr "OmoguÄi obaveÅtenja kada prijatelj ode sa mreÅe"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "ObaveÅtenja"
 
 #: ../src/empathy-preferences.ui.h:18
-msgid "Location sources:"
-msgstr "Izvori lokacija:"
+msgid "_Enable sound notifications"
+msgstr "OmoguÄi _zvuÄna obaveÅtenja"
 
 #: ../src/empathy-preferences.ui.h:19
-msgid "Log conversations"
-msgstr "ZabeleÅi razgovore"
+msgid "Disable sounds when _away or busy"
+msgstr "IskljuÄi zvuke kada sam _odsutan ili zauzet"
 
 #: ../src/empathy-preferences.ui.h:20
-msgid "Notifications"
-msgstr "ObaveÅtenja"
-
-#: ../src/empathy-preferences.ui.h:21
 msgid "Play sound for events"
 msgstr "Pusti zvuk za dogaÄaje"
 
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "Zvuci"
+
 #: ../src/empathy-preferences.ui.h:22
-msgid "Privacy"
-msgstr "Privatnost"
+msgid "Use _echo cancellation to improve call quality"
+msgstr "Koristi uklanjanje _odjeka da poboljÅaÅ kvalitet poziva"
 
 #: ../src/empathy-preferences.ui.h:23
 msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
 msgstr ""
-"Umanjena taÄnost lokacije znaÄi da Äe najtaÄniji objavljeni podaci o vaÅoj "
-"lokaciji biti grad i drÅava.  GPS koordinate Äe biti taÄne do 1. decimale."
-
-#: ../src/empathy-preferences.ui.h:24
-msgid "Show _smileys as images"
-msgstr "PrikaÅi slike _smeÅaka"
-
-#: ../src/empathy-preferences.ui.h:25
-msgid "Show contact _list in rooms"
-msgstr "PrikaÅi spisak _prijatelja u sobama"
+"Uklanjanje odjeka Äini da vaÅ glas drugoj osobi zvuÄi jasnije, ali moÅe da "
+"izazove probleme na nekim raÄunarima. Ako vi ili vaÅ sagovornik Äujete Äudne "
+"Åumove ili krÄanje za vreme poziva, pokuÅajte da iskljuÄite uklanjanje odjeka i "
+"ponovo pokrenite poziv."
 
 #: ../src/empathy-preferences.ui.h:26
-msgid "Sounds"
-msgstr "Zvuci"
+msgid "_Publish location to my contacts"
+msgstr "Objavi lokaciju mojim _prijateljima"
 
 #: ../src/empathy-preferences.ui.h:27
-msgid "Spell Checking"
-msgstr "Provera pisanja"
-
-#: ../src/empathy-preferences.ui.h:28
 msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
-"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
-"reÄnike."
+"Umanjena taÄnost lokacije znaÄi da Äe najtaÄniji objavljeni podaci o vaÅoj "
+"lokaciji biti grad i drÅava.  GPS koordinate Äe biti taÄne do 1. decimale."
 
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:29
-msgid "Themes"
-msgstr "Teme"
+msgid "_Reduce location accuracy"
+msgstr "Umanji _taÄnost lokacije"
 
 #: ../src/empathy-preferences.ui.h:30
-msgid "Variant:"
-msgstr "Varijanta:"
+msgid "Privacy"
+msgstr "Privatnost"
 
 #: ../src/empathy-preferences.ui.h:31
-msgid "_Automatically connect on startup"
-msgstr "_Sam se poveÅi nakon pokretanja"
+msgid "_GPS"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:32
 msgid "_Cellphone"
 msgstr "_Mobilni telefon"
 
 #: ../src/empathy-preferences.ui.h:33
-msgid "_Enable bubble notifications"
-msgstr "_OmoguÄi obaveÅtenja u oblaÄiÄima"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "_MreÅa (IP, beÅiÄna)"
 
 #: ../src/empathy-preferences.ui.h:34
-msgid "_Enable sound notifications"
-msgstr "OmoguÄi _zvuÄna obaveÅtenja"
-
-#: ../src/empathy-preferences.ui.h:35
-msgid "_GPS"
-msgstr "_GPS"
+msgid "Location sources:"
+msgstr "Izvori lokacija:"
 
 #: ../src/empathy-preferences.ui.h:36
-msgid "_Network (IP, Wi-Fi)"
-msgstr "_MreÅa (IP, beÅiÄna)"
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+"Ovaj spisak jezika predstavlja samo one jezike za koje imate instalirane "
+"reÄnike."
 
 #: ../src/empathy-preferences.ui.h:37
-msgid "_Open new chats in separate windows"
-msgstr "_Otvaraj Äaskanja u novim prozorima"
+msgid "Enable spell checking for languages:"
+msgstr "OmoguÄi proveru pravopisa za sledeÄe jezike:"
 
 #: ../src/empathy-preferences.ui.h:38
-msgid "_Publish location to my contacts"
-msgstr "Objavi lokaciju mojim _prijateljima"
+msgid "Spell Checking"
+msgstr "Provera pisanja"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "_Tema Äaskanja:"
 
-#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345Â is rounded to round(146,2345*10)/10 = 146,2 degrees.
 #: ../src/empathy-preferences.ui.h:40
-msgid "_Reduce location accuracy"
-msgstr "Umanji _taÄnost lokacije"
+msgid "Variant:"
+msgstr "Varijanta:"
 
-#: ../src/empathy-status-icon.ui.h:2
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "Teme"
+
+#: ../src/empathy-status-icon.ui.h:4
 msgid "Status"
 msgstr "Stanje"
 
-#: ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-status-icon.ui.h:5
 msgid "_Quit"
 msgstr "_IzaÄi"
 
-#: ../src/empathy-streamed-media-window.ui.h:2
-msgid "Call the contact again"
-msgstr "Pozovi prijatelja ponovo"
-
 #: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Camera Off"
-msgstr "Isklj. kameru"
+msgid "Redial"
+msgstr "Ponovo zovi"
 
 #: ../src/empathy-streamed-media-window.ui.h:4
-msgid "Camera On"
-msgstr "Uklj. kameru"
+msgid "V_ideo"
+msgstr "V_ideo"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "Isklj. video"
 
 #: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "OnemoguÄiÂkameruÂiÂprestaniÂdaÂÅaljeÅÂvideo"
+msgid "Video Preview"
+msgstr "Pregled videa"
 
 #: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Enable camera and send video"
-msgstr "OmoguÄiÂkameruÂiÂÅaljiÂvideo"
+msgid "Video On"
+msgstr "Uklj. video"
 
-#: ../src/empathy-streamed-media-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "OmoguÄi kameru, ali ne Åalji video"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "Pozovi prijatelja ponovo"
 
 #: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Preview"
-msgstr "Pregled"
+msgid "Camera Off"
+msgstr "Isklj. kameru"
 
 #: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Redial"
-msgstr "Ponovo zovi"
+msgid "Disable camera and stop sending video"
+msgstr "OnemoguÄiÂkameruÂiÂprestaniÂdaÂÅaljeÅÂvideo"
 
-#: ../src/empathy-streamed-media-window.ui.h:19
-msgid "V_ideo"
-msgstr "V_ideo"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "Pregled"
 
-#: ../src/empathy-streamed-media-window.ui.h:21
-msgid "Video Off"
-msgstr "Isklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "OmoguÄi kameru, ali ne Åalji video"
 
-#: ../src/empathy-streamed-media-window.ui.h:22
-msgid "Video On"
-msgstr "Uklj. video"
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "Uklj. kameru"
 
-#: ../src/empathy-streamed-media-window.ui.h:23
-msgid "Video Preview"
-msgstr "Pregled videa"
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "OmoguÄiÂkameruÂiÂÅaljiÂvideo"
 
-#: ../src/empathy-map-view.c:448
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "Mapa prijatelja"
 
@@ -4597,16 +4672,16 @@ msgid ""
 msgstr ""
 "Izabrani upravnik veze ne podrÅava proÅirenje za udaljeno otklanjanje greÅaka."
 
-#: ../src/empathy-invite-participant-dialog.c:179
-#: ../src/empathy-invite-participant-dialog.c:205
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
 msgstr "Pozovi uÄesnike"
 
-#: ../src/empathy-invite-participant-dialog.c:180
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "Izaberite prijatelja za pozivanje u ovaj razgovor:"
 
-#: ../src/empathy-invite-participant-dialog.c:201
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "Pozovi"
 
@@ -4630,23 +4705,28 @@ msgstr ""
 msgid "<account-id>"
 msgstr "<identifikacija naloga>"
 
-#: ../src/empathy-accounts.c:198
+#: ../src/empathy-accounts.c:196
+#| msgid "Show Balance in contact list"
+msgid "Show account assistant"
+msgstr "Prikazuje pomoÄnika naloga"
+
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
 msgstr "â Nalozi PismonoÅe"
 
-#: ../src/empathy-accounts.c:237
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
 msgstr "Nalozi PismonoÅe"
 
-#: ../src/empathy-debugger.c:70
+#: ../src/empathy-debugger.c:69
 msgid "Show a particular service"
 msgstr "PrikaÅi posebnu uslugu"
 
-#: ../src/empathy-debugger.c:75
+#: ../src/empathy-debugger.c:74
 msgid "- Empathy Debugger"
 msgstr "â Otklanjanje greÅaka PismonoÅe"
 
-#: ../src/empathy-debugger.c:114
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Otklanjanje greÅaka PismonoÅe"
 
@@ -4654,39 +4734,39 @@ msgstr "Otklanjanje greÅaka PismonoÅe"
 msgid "- Empathy Chat Client"
 msgstr "â PismonoÅa program za Äaskanje"
 
-#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-notifications-approver.c:190
 msgid "Respond"
 msgstr "Odgovori"
 
-#: ../src/empathy-notifications-approver.c:217
-#: ../src/empathy-call-window.c:1459
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1565
 msgid "Reject"
 msgstr "Odbaci"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:227
-#: ../src/empathy-call-window.c:1460
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1566
 msgid "Answer"
 msgstr "Javi se"
 
-#: ../src/empathy-notifications-approver.c:227
+#: ../src/empathy-notifications-approver.c:214
 msgid "Answer with video"
 msgstr "Odgovori sa videom"
 
-#: ../src/empathy-notifications-approver.c:235
-#: ../src/empathy-notifications-approver.c:245
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
 msgid "Decline"
 msgstr "Odbij"
 
-#: ../src/empathy-notifications-approver.c:239
-#: ../src/empathy-notifications-approver.c:250
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
 msgid "Accept"
 msgstr "Prihvati"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:260
+#: ../src/empathy-notifications-approver.c:247
 msgid "Provide"
 msgstr "Obezbedi"
 
@@ -4697,32 +4777,200 @@ msgstr "%s je pokuÅao da vas zove, ali ste vi bili na drugoj vezi."
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1088 ../src/empathy-call-window.c:1111
+#: ../src/empathy-call-window.c:1172 ../src/empathy-call-window.c:1195
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2775
+#: ../src/empathy-call-window.c:2929
 msgid "On hold"
 msgstr "Na Äekanju"
 
-#: ../src/empathy-call-window.c:2778
+#: ../src/empathy-call-window.c:2932
 msgid "Mute"
 msgstr "UtiÅaj"
 
-#: ../src/empathy-call-window.c:2780
+#: ../src/empathy-call-window.c:2934
 msgid "Duration"
 msgstr "Trajanje"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2783
+#: ../src/empathy-call-window.c:2937
 #, c-format
 msgid "%s â %d:%02dm"
 msgstr "%s â %d:%02dm"
 
+#: ../src/empathy-call-window.c:3207
+#, c-format
+msgid "Your current balance is %s."
+msgstr "VaÅe trenutno stanje je %s."
+
+#: ../src/empathy-call-window.c:3211
+msgid "Sorry, you donât have enough credit for that call."
+msgstr "Izvinite, ali nemate dovoljno kredita za ovaj poziv."
+
+#: ../src/empathy-call-window.c:3213
+#| msgid "Top Up..."
+msgid "Top Up"
+msgstr "Dopuni"
+
 #: ../libempathy-gtk/empathy-search-bar.c:243
 msgid "_Match case"
 msgstr "_Uporedi veliÄinu slova"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+#| msgid "New account"
+msgid "Adding new account"
+msgstr "Dodajem novi nalog"
+
+#~ msgid "Call volume"
+#~ msgstr "JaÄina zvuka poziva"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "JaÄina zvuka poziva, u procentima."
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "PismonoÅa je prebacio dnevnike iz leptira"
+
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Da li je PismonoÅa prebacio dnevnike iz leptira."
+
+#~ msgid "Socket type not supported"
+#~ msgstr "Vrsta prikljuÄka nije podrÅana"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "Moji veb nalozi"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "Nalog %s je izmenjen putem %s."
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "Nalog %s ne moÅe biti ureÄivan iz PismonoÅe."
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "Pokreni Moje veb naloge"
+
+#~ msgid "Edit %s"
+#~ msgstr "Izmeni %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "Po_niÅti"
+
+#~ msgid "Personal Information"
+#~ msgstr "Podaci o profilu"
+
+#~ msgid "Ungrouped"
+#~ msgstr "Negrupisano"
+
+#~ msgid "Favorite People"
+#~ msgstr "Omiljeni ljudi"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "Izm_eni"
+
+#~ msgid "Select a contact"
+#~ msgstr "Izaberite prijatelja"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "Povezani prijatelji"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "Izaberite prijatelja za povezivanje"
+
+#~ msgid "New contact preview"
+#~ msgstr "Pregled novog prijatelja"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "OznaÄeni prijatelji na spisku levo Äe biti uvezani zajedno."
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contactsâ"
+#~ msgstr "_PoveÅi kontakteâ"
+
+#~ msgid "Link Contacts"
+#~ msgstr "PoveÅi prijatelje"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlinkâ"
+#~ msgstr "_RazveÅiâ"
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "Razdvaja uvezane kontakte u posebne prijatelje."
+
+#~ msgid "_Link"
+#~ msgstr "_UveÅi"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "Da razveÅem uvezanog prijatelja â%sâ?"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "Da li ste sigurni da Åelite da razveÅete uvezanog prijatelja? Ovim Äete "
+#~ "razdvojiti uvezane kontakte u posebne prijatelje."
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "_RazveÅi"
+
+#~ msgid "Contact ID:"
+#~ msgstr "IB prijatelja:"
+
+#~ msgid "C_hat"
+#~ msgstr "Ä_askaj"
+
+#~ msgid "Send _Video"
+#~ msgstr "PoÅalji _video"
+
+#~ msgid "C_all"
+#~ msgstr "_Pozovi"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "Postavite vaÅe prisustvo i trenutno stanje"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "Izabrani prijatelj ne moÅe da primi datoteke."
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "Izabrani prijatelj nije na vezi."
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "Ovim Äete napraviti novi nalog, zanemarivÅi unete izmene.\n"
+#~ "Da li sigurno Åelite da nastavite?"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "Nepoznato"
+
+#~ msgid "_Personal Information"
+#~ msgstr "LiÄni _podaci"
+
+#~ msgid "Input level:"
+#~ msgstr "Ulazni nivo:"
+
+#~ msgid "Input volume:"
+#~ msgstr "JaÄina ulaznog zvuka:"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "_Otvaraj Äaskanja u novim prozorima"
+
 #~ msgid "All"
 #~ msgstr "Sve"
 



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